From 1bf1972968982cb335915b4c5ba9a4259a164af9 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Thu, 6 Feb 2003 19:57:05 +0000 Subject: Update to gcc 3.2.2 by default. Move a mips patch to be more obvious. Update the default uClibc config. --- make/uclibc_toolchain.mk | 8 +++---- make/uclibc_toolchain_2_95.mk | 4 ++-- sources/gcc-002-mips-swfp.patch | 52 +++++++++++++++++++++++++++++++++++++++++ sources/gcc-002-swfp.patch | 52 ----------------------------------------- sources/uClibc.config | 1 + 5 files changed, 59 insertions(+), 58 deletions(-) create mode 100644 sources/gcc-002-mips-swfp.patch delete mode 100644 sources/gcc-002-swfp.patch diff --git a/make/uclibc_toolchain.mk b/make/uclibc_toolchain.mk index 40e8be5a8..d8ccea34a 100644 --- a/make/uclibc_toolchain.mk +++ b/make/uclibc_toolchain.mk @@ -39,8 +39,8 @@ MULTILIB:=--enable-multilib # ############################################################# BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/ -BINUTILS_SOURCE:=binutils-2.13.2.tar.bz2 -BINUTILS_DIR:=$(BUILD_DIR)/binutils-2.13.2 +BINUTILS_SOURCE:=binutils-2.13.2.1.tar.bz2 +BINUTILS_DIR:=$(BUILD_DIR)/binutils-2.13.2.1 # # Perhaps you would perfer to use the older 2.12.1 version? #BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/ @@ -59,8 +59,8 @@ UCLIBC_SITE:=http://www.kernel.org/pub/linux/libs/uclibc endif GCC_SITE:=ftp://ftp.gnu.org/gnu/gcc/ -GCC_SOURCE:=gcc-3.2.1.tar.gz -GCC_DIR:=$(BUILD_DIR)/gcc-3.2.1 +GCC_SOURCE:=gcc-3.2.2.tar.gz +GCC_DIR:=$(BUILD_DIR)/gcc-3.2.2 diff --git a/make/uclibc_toolchain_2_95.mk b/make/uclibc_toolchain_2_95.mk index a2910abfe..4778d7e63 100644 --- a/make/uclibc_toolchain_2_95.mk +++ b/make/uclibc_toolchain_2_95.mk @@ -39,8 +39,8 @@ MULTILIB:=--enable-multilib # ############################################################# BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/ -BINUTILS_SOURCE:=binutils-2.13.2.tar.bz2 -BINUTILS_DIR:=$(BUILD_DIR)/binutils-2.13.2 +BINUTILS_SOURCE:=binutils-2.13.2.1.tar.bz2 +BINUTILS_DIR:=$(BUILD_DIR)/binutils-2.13.2.1 # # Perhaps you would perfer to use the older 2.12.1 version? #BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/ diff --git a/sources/gcc-002-mips-swfp.patch b/sources/gcc-002-mips-swfp.patch new file mode 100644 index 000000000..34e6566a9 --- /dev/null +++ b/sources/gcc-002-mips-swfp.patch @@ -0,0 +1,52 @@ +diff -urN gcc-3.2/gcc/config/mips/t-linux gcc-3.2-patched/gcc/config/mips/t-linux +--- gcc-3.2.orig/gcc/config/mips/t-linux Wed Jan 16 17:22:02 2002 ++++ gcc-3.2/gcc/config/mips/t-linux Mon Nov 11 15:23:33 2002 +@@ -1,3 +1,48 @@ ++# Don't run fixproto ++STMP_FIXPROTO = ++ ++# Don't install "assert.h" in gcc. We use the one in glibc. ++INSTALL_ASSERT_H = ++ ++# nop@nop.com: -fdata-sections messes with crtstuff.c's strategy to get ++# ctors/dtors/eh in special sections. ++CRTSTUFF_T_CFLAGS = -fno-data-sections ++CRTSTUFF_T_CFLAGS_S = -fno-data-sections ++# Hopefully that's enough. ++ ++# Do not build libgcc1. Let gcc generate those functions. The GNU/Linux ++# C library can handle them. ++LIBGCC1 = ++CROSS_LIBGCC1 = ++LIBGCC1_TEST = ++ ++# Standard softfloat incantation: ++ ++LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c ++ ++dp-bit.c: $(srcdir)/config/fp-bit.c ++ echo '#ifdef __MIPSEL__' > dp-bit.c ++ echo '#define FLOAT_BIT_ORDER_MISMATCH' >> dp-bit.c ++ echo '#endif' >> dp-bit.c ++ echo '#undef US_SOFTWARE_GOFAST' >> dp-bit.c ++ echo '#undef FLOAT' >> dp-bit.c ++ cat $(srcdir)/config/fp-bit.c >> dp-bit.c ++ ++fp-bit.c: $(srcdir)/config/fp-bit.c ++ echo '#ifdef __MIPSEL__' > fp-bit.c ++ echo '#define FLOAT_BIT_ORDER_MISMATCH' >> fp-bit.c ++ echo '#endif' >> fp-bit.c ++ echo '#undef US_SOFTWARE_GOFAST' >> fp-bit.c ++ echo '#define FLOAT' >> fp-bit.c ++ cat $(srcdir)/config/fp-bit.c >> fp-bit.c ++ ++MULTILIB_OPTIONS = msoft-float ++MULTILIB_DIRNAMES = soft-float ++MULTILIB_MATCHES = ++MULTILIB_EXTRA_OPTS = ++ ++LIBGCC = stmp-multilib ++INSTALL_LIBGCC = install-multilib + # We want fine grained libraries, so use the new code to build the + # floating point emulation libraries. + FPBIT = fp-bit.c diff --git a/sources/gcc-002-swfp.patch b/sources/gcc-002-swfp.patch deleted file mode 100644 index 34e6566a9..000000000 --- a/sources/gcc-002-swfp.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -urN gcc-3.2/gcc/config/mips/t-linux gcc-3.2-patched/gcc/config/mips/t-linux ---- gcc-3.2.orig/gcc/config/mips/t-linux Wed Jan 16 17:22:02 2002 -+++ gcc-3.2/gcc/config/mips/t-linux Mon Nov 11 15:23:33 2002 -@@ -1,3 +1,48 @@ -+# Don't run fixproto -+STMP_FIXPROTO = -+ -+# Don't install "assert.h" in gcc. We use the one in glibc. -+INSTALL_ASSERT_H = -+ -+# nop@nop.com: -fdata-sections messes with crtstuff.c's strategy to get -+# ctors/dtors/eh in special sections. -+CRTSTUFF_T_CFLAGS = -fno-data-sections -+CRTSTUFF_T_CFLAGS_S = -fno-data-sections -+# Hopefully that's enough. -+ -+# Do not build libgcc1. Let gcc generate those functions. The GNU/Linux -+# C library can handle them. -+LIBGCC1 = -+CROSS_LIBGCC1 = -+LIBGCC1_TEST = -+ -+# Standard softfloat incantation: -+ -+LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c -+ -+dp-bit.c: $(srcdir)/config/fp-bit.c -+ echo '#ifdef __MIPSEL__' > dp-bit.c -+ echo '#define FLOAT_BIT_ORDER_MISMATCH' >> dp-bit.c -+ echo '#endif' >> dp-bit.c -+ echo '#undef US_SOFTWARE_GOFAST' >> dp-bit.c -+ echo '#undef FLOAT' >> dp-bit.c -+ cat $(srcdir)/config/fp-bit.c >> dp-bit.c -+ -+fp-bit.c: $(srcdir)/config/fp-bit.c -+ echo '#ifdef __MIPSEL__' > fp-bit.c -+ echo '#define FLOAT_BIT_ORDER_MISMATCH' >> fp-bit.c -+ echo '#endif' >> fp-bit.c -+ echo '#undef US_SOFTWARE_GOFAST' >> fp-bit.c -+ echo '#define FLOAT' >> fp-bit.c -+ cat $(srcdir)/config/fp-bit.c >> fp-bit.c -+ -+MULTILIB_OPTIONS = msoft-float -+MULTILIB_DIRNAMES = soft-float -+MULTILIB_MATCHES = -+MULTILIB_EXTRA_OPTS = -+ -+LIBGCC = stmp-multilib -+INSTALL_LIBGCC = install-multilib - # We want fine grained libraries, so use the new code to build the - # floating point emulation libraries. - FPBIT = fp-bit.c diff --git a/sources/uClibc.config b/sources/uClibc.config index 7b464a8da..d1f436f2b 100644 --- a/sources/uClibc.config +++ b/sources/uClibc.config @@ -33,6 +33,7 @@ C_SYMBOL_PREFIX="" # DOPIC=y HAVE_SHARED=y +# ADD_LIBGCC_FUNCTIONS is not set BUILD_UCLIBC_LDSO=y LDSO_LDD_SUPPORT=y UCLIBC_CTOR_DTOR=y -- cgit v1.2.3