linux-mips
[Top] [All Lists]

Lossage do to #ifndef __ASSEMBLY__ in mipsregs.h

To: linux-mips@linux-mips.org
Subject: Lossage do to #ifndef __ASSEMBLY__ in mipsregs.h
From: David Daney <ddaney@avtrex.com>
Date: Thu, 22 Jan 2004 15:19:11 -0800
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4.1) Gecko/20031030
I am using gcc 3.3.1 to compile the linux_2_4 kernel obtained from cvs a couple of days ago.

My gcc defines these assemble related macros:

[daney@dl xilleon]$ mipsel-linux-gcc -D__KERNEL__ -I/newdisk/programs/linux-mips.org/linux/include -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -fomit-frame-pointer -I /newdisk/programs/linux-mips.org/linux/include/asm/gcc -G 0 -mno-abicalls -fno-pic -finline-limit=100000 -mabi=32 -march=mips32 -mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap -DLINUX_RAM_START=0x80100000 -dM -E -c xilleonIRQ.S | grep ASS
#define __ASSEMBLER__ 1
#define LANGUAGE_ASSEMBLY 1
#define __LANGUAGE_ASSEMBLY 1
#define __LANGUAGE_ASSEMBLY__ 1
#define _LANGUAGE_ASSEMBLY 1

Now in mipsregs.h we have:
.
.
.
#ifndef __ASSEMBLY__
.
.
.

So I get a ton of errors trying to assemble the file.

Now back on 2002/06/27 we have:

===================================================================
RCS file: /home/cvs/linux/include/asm-mips/mipsregs.h,v
retrieving revision 1.30.2.8
retrieving revision 1.30.2.9
diff -u -p -r1.30.2.8 -r1.30.2.9
--- linux/include/asm-mips/mipsregs.h   2002/06/27 09:53:37     1.30.2.8
+++ linux/include/asm-mips/mipsregs.h   2002/06/27 14:21:23     1.30.2.9
@@ -445,7 +445,7 @@
#define CEB_KERNEL      2       /* Count events in kernel mode EXL = ERL = 0 */
#define CEB_EXL         1       /* Count events with EXL = 1, ERL = 0 */

-#ifndef _LANGUAGE_ASSEMBLY
+#ifndef __ASSEMBLY__

/*
 * Functions to access the r10k performance counter and control registers
@@ -1023,6 +1023,6 @@ do {                                                      
                \
                __disable_fpu();                                        \
} while (0)

-#endif /* !defined (_LANGUAGE_ASSEMBLY) */
+#endif /* !__ASSEMBLY__ */

#endif /* _ASM_MIPSREGS_H */

Why the change?

I will fix my local mipsregs.h so that I can continue, but it seems like the sources in CVS should be changed to allow gcc 3.3.1 to work.

David Daney.




<Prev in Thread] Current Thread [Next in Thread>