This is the mail archive of the binutils@sources.redhat.com mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[patch] m88k build failure


include/opcodes/m88k.h defines a macro named "mode". This causes a build 
failure because libiberty uses a variable with that name.

The attached patch renames these macros. I searched the whole of the src 
repository, and AFAICS they're not actually used anywhere.

Build --enable-targets=all
Ok?

Paul

2005-04-12  Paul Brook  <paul@codesourcery.com>

	* opcode/m88k.h: Rename psr macros to avoid conflicts.
Index: include/opcode/m88k.h
===================================================================
RCS file: /var/cvsroot/src-cvs/src/include/opcode/m88k.h,v
retrieving revision 1.5
diff -u -p -r1.5 m88k.h
--- include/opcode/m88k.h	3 Mar 2005 11:58:10 -0000	1.5
+++ include/opcode/m88k.h	12 Apr 2005 16:00:14 -0000
@@ -231,22 +231,22 @@ struct PROCESSOR
 
 /* Definitions for fields in psr.  */
 
-#define mode  31
-#define rbo   30
-#define ser   29
-#define carry 28
-#define sf7m  11
-#define sf6m  10
-#define sf5m   9
-#define sf4m   8
-#define sf3m   7
-#define sf2m   6
-#define sf1m   5
-#define mam    4
-#define inm    3
-#define exm    2
-#define trm    1
-#define ovfm   0
+#define psr_mode  31
+#define psr_rbo   30
+#define psr_ser   29
+#define psr_carry 28
+#define psr_sf7m  11
+#define psr_sf6m  10
+#define psr_sf5m   9
+#define psr_sf4m   8
+#define psr_sf3m   7
+#define psr_sf2m   6
+#define psr_sf1m   5
+#define psr_mam    4
+#define psr_inm    3
+#define psr_exm    2
+#define psr_trm    1
+#define psr_ovfm   0
 
 /* The 1 clock operations.  */
 

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]