summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-04-30 12:10:24 -0700
committerYamaArashi <shadow962@live.com>2016-04-30 12:10:24 -0700
commiteb6255a9114c5b746a1f5921b0c88546c098ef86 (patch)
tree29b6f8acbfb5295cd84fd743437150f274a67389
parentd1cb3194bb20a44eecafe4186cf4e368f2a4d5b8 (diff)
fix problems building on 64-bit Linux
-rw-r--r--ginclude/limits.h15
-rw-r--r--libgcc/Makefile8
2 files changed, 7 insertions, 16 deletions
diff --git a/ginclude/limits.h b/ginclude/limits.h
index 3d74de0..bd3e2e4 100644
--- a/ginclude/limits.h
+++ b/ginclude/limits.h
@@ -37,13 +37,10 @@
#define USHRT_MAX 65535
/* Minimum and maximum values a `signed int' can hold. */
-#ifndef __INT_MAX__
-#define __INT_MAX__ 2147483647
-#endif
#undef INT_MIN
#define INT_MIN (-INT_MAX-1)
#undef INT_MAX
-#define INT_MAX __INT_MAX__
+#define INT_MAX 2147483647
/* Maximum value an `unsigned int' can hold. (Minimum is 0). */
#undef UINT_MAX
@@ -51,26 +48,20 @@
/* Minimum and maximum values a `signed long int' can hold.
(Same as `int'). */
-#ifndef __LONG_MAX__
-#define __LONG_MAX__ 2147483647L
-#endif
#undef LONG_MIN
#define LONG_MIN (-LONG_MAX-1)
#undef LONG_MAX
-#define LONG_MAX __LONG_MAX__
+#define LONG_MAX 2147483647L
/* Maximum value an `unsigned long int' can hold. (Minimum is 0). */
#undef ULONG_MAX
#define ULONG_MAX (LONG_MAX * 2UL + 1)
/* Minimum and maximum values a `signed long long int' can hold. */
-#ifndef __LONG_LONG_MAX__
-#define __LONG_LONG_MAX__ 9223372036854775807LL
-#endif
#undef LONG_LONG_MIN
#define LONG_LONG_MIN (-LONG_LONG_MAX-1)
#undef LONG_LONG_MAX
-#define LONG_LONG_MAX __LONG_LONG_MAX__
+#define LONG_LONG_MAX 9223372036854775807LL
/* Maximum value an `unsigned long long int' can hold. (Minimum is 0). */
#undef ULONG_LONG_MAX
diff --git a/libgcc/Makefile b/libgcc/Makefile
index d24bc01..6d50938 100644
--- a/libgcc/Makefile
+++ b/libgcc/Makefile
@@ -23,7 +23,7 @@ libgcc1.a: lib1thumb.asm
for name in $(LIB1ASMFUNCS); \
do \
echo $${name}; \
- $(CPP) -DL$${name} -x assembler-with-cpp -o $${name}.s lib1thumb.asm; \
+ $(CPP) -undef -nostdinc -DL$${name} -x assembler-with-cpp -o $${name}.s lib1thumb.asm; \
echo -e ".text\n\t.align\t2, 0\n" >> $${name}.s ; \
$(AS) -mcpu=arm7tdmi -o $${name}.o $${name}.s; \
rm -f $${name}.s; \
@@ -40,7 +40,7 @@ libgcc2.a: libgcc2.c longlong.h
for name in $(LIB2FUNCS); \
do \
echo $${name}; \
- $(CPP) -I ../ginclude -nostdinc -DL$${name} -o $${name}.i libgcc2.c; \
+ $(CPP) -undef -I ../ginclude -nostdinc -DL$${name} -o $${name}.i libgcc2.c; \
$(CC1) -O2 $${name}.i; \
rm -f $${name}.i; \
echo -e ".text\n\t.align\t2, 0\n" >> $${name}.s ; \
@@ -52,7 +52,7 @@ libgcc2.a: libgcc2.c longlong.h
mv tmplibgcc2.a libgcc2.a
fp-bit.o: fp-bit.c
- $(CPP) -I ../ginclude -nostdinc -o fp-bit.i fp-bit.c
+ $(CPP) -undef -I ../ginclude -nostdinc -o fp-bit.i fp-bit.c
$(CC1) -O2 fp-bit.i
rm -f fp-bit.i
echo -e ".text\n\t.align\t2, 0\n" >> fp-bit.s
@@ -60,7 +60,7 @@ fp-bit.o: fp-bit.c
rm -f fp-bit.s
dp-bit.o: dp-bit.c
- $(CPP) -I ../ginclude -nostdinc -o dp-bit.i dp-bit.c
+ $(CPP) -undef -I ../ginclude -nostdinc -o dp-bit.i dp-bit.c
$(CC1) -O2 dp-bit.i
rm -f dp-bit.i
echo -e ".text\n\t.align\t2, 0\n" >> dp-bit.s