Switch to using gcc 3.3

diff --git a/make/gcc_target.mk b/make/gcc_target.mk
index 3c286e2ee77f5f4bba8cdf0e832ab79b5609b87c..2beb4acc3baabcf657a2cab88c70b3b0999722c3 100644 (file)
--- a/make/gcc_target.mk
+++ b/make/gcc_target.mk
@@ -32,12 +32,12 @@ GCC_DEPENDANCY=gcc_final
 GCC_INSTALL_TARGET=install-gcc
 else
 BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/
-BINUTILS_SOURCE:=binutils-2.13.2.1.tar.bz2
-BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-2.13.2.1
+BINUTILS_SOURCE:=binutils-2.14.tar.bz2
+BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-2.14
 
 GCC_SITE:=ftp://ftp.gnu.org/gnu/gcc/
-GCC_SOURCE:=gcc-3.2.2.tar.gz
-GCC_DIR:=$(TOOL_BUILD_DIR)/gcc-3.2.2
+GCC_SOURCE:=gcc-3.2.tar.gz
+GCC_DIR:=$(TOOL_BUILD_DIR)/gcc-3.3
 GCC_INSTALL_TARGET=install
 endif
 

diff --git a/make/uclibc_toolchain.mk b/make/uclibc_toolchain.mk
index bd60dfd1df65c4600d42fb59e08e38d9e146f29a..6a7310f7a619ac7c9723a924f911ce2bcaef0574 100644 (file)
--- a/make/uclibc_toolchain.mk
+++ b/make/uclibc_toolchain.mk
@@ -42,13 +42,8 @@ MULTILIB:=--enable-multilib
 #
 #############################################################
 BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/
-BINUTILS_SOURCE:=binutils-2.13.2.1.tar.bz2
-BINUTILS_DIR:=$(TOOL_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/
-#BINUTILS_SOURCE:=binutils-2.12.1.tar.bz2
-#BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-2.12.1
+BINUTILS_SOURCE:=binutils-2.14.tar.bz2
+BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-2.14
 
 ifeq ($(USE_UCLIBC_SNAPSHOT),true)
 # Be aware that this changes daily....
@@ -62,8 +57,8 @@ UCLIBC_SITE:=http://www.uclibc.org/downloads
 endif
 
 GCC_SITE:=ftp://ftp.gnu.org/gnu/gcc/
-GCC_SOURCE:=gcc-3.2.3.tar.gz
-GCC_DIR:=$(TOOL_BUILD_DIR)/gcc-3.2.3
+GCC_SOURCE:=gcc-3.3.tar.gz
+GCC_DIR:=$(TOOL_BUILD_DIR)/gcc-3.3
 
 
 
@@ -404,12 +399,12 @@ $(GCC_DIR)/.g++_build_hacks: $(GCC_DIR)/.patched
        #
        perl -i -p -e "s,defined.*_GLIBCPP_USE_C99.*,1,g;" \
                $(GCC_DIR)/libstdc++-v3/config/locale/generic/c_locale.cc;
-       cp $(GCC_DIR)/libstdc++-v3/config/os/generic/bits/ctype_base.h \
-               $(GCC_DIR)/libstdc++-v3/config/os/gnu-linux/bits/
-       cp $(GCC_DIR)/libstdc++-v3/config/os/generic/bits/ctype_inline.h \
-               $(GCC_DIR)/libstdc++-v3/config/os/gnu-linux/bits/
-       cp $(GCC_DIR)/libstdc++-v3/config/os/generic/bits/ctype_noninline.h \
-               $(GCC_DIR)/libstdc++-v3/config/os/gnu-linux/bits/
+       cp $(GCC_DIR)/libstdc++-v3/config/os/generic/ctype_base.h \
+               $(GCC_DIR)/libstdc++-v3/config/os/gnu-linux/
+       cp $(GCC_DIR)/libstdc++-v3/config/os/generic/ctype_inline.h \
+               $(GCC_DIR)/libstdc++-v3/config/os/gnu-linux/
+       cp $(GCC_DIR)/libstdc++-v3/config/os/generic/ctype_noninline.h \
+               $(GCC_DIR)/libstdc++-v3/config/os/gnu-linux/
        touch $(GCC_DIR)/.g++_build_hacks
 
 $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.g++_build_hacks

diff --git a/make/uclibc_toolchain_2_95.mk b/make/uclibc_toolchain_2_95.mk
index d36116b1d62017710f1b3d8bdb297ad721ce3123..d320624070c9189db5b7b72d8b747ef811475ec9 100644 (file)
--- a/make/uclibc_toolchain_2_95.mk
+++ b/make/uclibc_toolchain_2_95.mk
@@ -42,13 +42,8 @@ MULTILIB:=--enable-multilib
 #
 #############################################################
 BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/
-BINUTILS_SOURCE:=binutils-2.13.2.1.tar.bz2
-BINUTILS_DIR:=$(TOOL_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/
-#BINUTILS_SOURCE:=binutils-2.12.1.tar.bz2
-#BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-2.12.1
+BINUTILS_SOURCE:=binutils-2.14.tar.bz2
+BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-2.14
 
 ifeq ($(USE_UCLIBC_SNAPSHOT),true)
 # Be aware that this changes daily....

diff --git a/sources/gcc-001-disable-mathf.patch b/sources/gcc-001-disable-mathf.patch
index fbb8a840a900ad7d1be74e5961c5567d633d2bbd..47729270259f6c92b3138d90dd915bc6cd341bd6 100644 (file)
--- a/sources/gcc-001-disable-mathf.patch
+++ b/sources/gcc-001-disable-mathf.patch
@@ -1,6 +1,6 @@
---- gcc-3.1/libstdc++-v3/configure     Tue May  7 23:27:59 2002
-+++ gcc-3.1-patched/libstdc++-v3/configure     Thu Aug  8 11:01:35 2002
-@@ -5034,10 +5034,6 @@
+--- gcc-3.3/libstdc++-v3/configure     2003-05-01 20:37:25.000000000 -0600
++++ gcc-3.3-patched/libstdc++-v3/configure     2003-06-21 00:22:02.000000000 -0600
+@@ -5163,10 +5163,6 @@
  EOF
  
        cat >> confdefs.h <<\EOF
@@ -11,11 +11,10 @@
  #define HAVE_HYPOTF 1
  EOF
  
-@@ -7873,128 +7869,6 @@
-       cat >> confdefs.h <<\EOF
+@@ -10293,103 +10289,6 @@
  #define HAVE_MMAP 1
  EOF
--
+ 
 -
 -      cat >> confdefs.h <<\EOF
 -#define HAVE_ACOSF 1
@@ -62,14 +61,6 @@
 -EOF
 -
 -      cat >> confdefs.h <<\EOF
--#define HAVE_FINITE 1
--EOF
--
--      cat >> confdefs.h <<\EOF
--#define HAVE_FINITEF 1
--EOF
--
--      cat >> confdefs.h <<\EOF
 -#define HAVE_FLOORF 1
 -EOF
 -
@@ -82,22 +73,6 @@
 -EOF
 -
 -      cat >> confdefs.h <<\EOF
--#define HAVE_ISINF 1
--EOF
--
--      cat >> confdefs.h <<\EOF
--#define HAVE_ISINFF 1
--EOF
--
--      cat >> confdefs.h <<\EOF
--#define HAVE_ISNAN 1
--EOF
--
--      cat >> confdefs.h <<\EOF
--#define HAVE_ISNANF 1
--EOF
--
--      cat >> confdefs.h <<\EOF
 -#define HAVE_LDEXPF 1
 -EOF
 -

diff --git a/sources/kernel-patches/002-x86_mathemu_gcc-3.3.patch.bz2 b/sources/kernel-patches/002-x86_mathemu_gcc-3.3.patch.bz2
new file mode 100644 (file)
index 0000000..dea9f32
Binary files /dev/null and b/sources/kernel-patches/002-x86_mathemu_gcc-3.3.patch.bz2 differ