summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/ChangeLog4
-rw-r--r--gas/config/tc-ia64.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1bfb0ea7de9..1c082533570 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-05 Steve Ellcey <sje@cup.hp.com>
+
+ * config/tc-ia64.c (MIN): Undef.
+
2005-05-05 Paul Brook <paul@codesourcery.com>
* config/tc-i386.h (ELF_TARGET_FORMAT): Define for TE_VXWORKS.
diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
index 31adc3d36f5..729ce27262d 100644
--- a/gas/config/tc-ia64.c
+++ b/gas/config/tc-ia64.c
@@ -56,6 +56,9 @@
#endif
#define NELEMS(a) ((int) (sizeof (a)/sizeof ((a)[0])))
+
+/* Some systems define MIN in, e.g., param.h. */
+#undef MIN
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#define NUM_SLOTS 4