From 2d76aa85de1ae2188becdedbfc00ce4eca3963af Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Mon, 31 May 2010 12:22:38 +0000
Subject: [PATCH] =?UTF-8?q?2010-05-31=09Ralf=20Cors=C3=A9pius=20<ralf.cors?=
 =?UTF-8?q?epius@rtems.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	PR 1531/newlib
	* libchip/network/i82586.c:
	Add local copy of ALIGN().
---
 c/src/ChangeLog                | 6 ++++++
 c/src/libchip/network/i82586.c | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index de1a601e24..3869b7c521 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-31	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	PR 1531/newlib
+	* libchip/network/i82586.c:
+	Add local copy of ALIGN().
+
 2010-05-31	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* libchip/network/cs8900.c:
diff --git a/c/src/libchip/network/i82586.c b/c/src/libchip/network/i82586.c
index c8e11bf7c1..4dd4a1d3ce 100644
--- a/c/src/libchip/network/i82586.c
+++ b/c/src/libchip/network/i82586.c
@@ -173,6 +173,15 @@ Mode of operation:
 #include "i82586reg.h"
 #include "i82586var.h"
 
+#if defined(ALIGNBYTES) && defined(ALIGN)
+/* FIXME: Redefine because some versions of 
+ * RTEMS newlib and the BSDs ship a broken ALIGN */
+#undef ALIGN
+#define ALIGN(p)	(((uintptr_t)(p) + ALIGNBYTES) & ~ALIGNBYTES)
+#else
+#define ALIGN(p)	(p)
+#endif
+
 /*
  * A global way to change all async cmd requests at once. For RTEMS and running
  * as tasks I wanted to see if the tx race condition is effected by this.