---
 toolchain/gcc/Config.in                            |    3 +
 toolchain/gcc/Config.version                       |   18 ++
 toolchain/gcc/Makefile                             |   28 ++
 toolchain/gcc/patches/4.3.1/100-uclibc-conf.patch  |   33 +++
 .../patches/4.3.1/104-gnuhurd-uclibc-conf.patch    |   13 +
 .../gcc/patches/4.3.1/301-missing-execinfo_h.patch |   11 +
 toolchain/gcc/patches/4.3.1/302-c99-snprintf.patch |   13 +
 .../4.3.1/305-libmudflap-susv3-legacy.patch        |   49 ++++
 .../patches/4.3.1/810-arm-softfloat-libgcc.patch   |   29 ++
 toolchain/gcc/patches/4.3.1/910-mbsd_multi.patch   |  284 ++++++++++++++++++++
 .../4.3.1/993-arm_insn-opinit-RTX_CODE-fixup.patch |   41 +++
 toolchain/gcc/patches/4.3.1/995-short-enums.diff   |   42 +++
 .../4.3.1/998-gcc-4.3.0-fix-header.00.patch        |   15 +
 toolchain/gcc/patches/4.3.1/999-cf.patch           |   10 +
 toolchain/gmp/Makefile                             |   46 ++++
 toolchain/mpfr/Makefile                            |   46 ++++
 toolchain/uClibc/Makefile                          |    5 +
 17 files changed, 686 insertions(+), 0 deletions(-)
 create mode 100644 toolchain/gcc/patches/4.3.1/100-uclibc-conf.patch
 create mode 100644 toolchain/gcc/patches/4.3.1/104-gnuhurd-uclibc-conf.patch
 create mode 100644 toolchain/gcc/patches/4.3.1/301-missing-execinfo_h.patch
 create mode 100644 toolchain/gcc/patches/4.3.1/302-c99-snprintf.patch
 create mode 100644 
toolchain/gcc/patches/4.3.1/305-libmudflap-susv3-legacy.patch
 create mode 100644 toolchain/gcc/patches/4.3.1/810-arm-softfloat-libgcc.patch
 create mode 100644 toolchain/gcc/patches/4.3.1/910-mbsd_multi.patch
 create mode 100644 
toolchain/gcc/patches/4.3.1/993-arm_insn-opinit-RTX_CODE-fixup.patch
 create mode 100644 toolchain/gcc/patches/4.3.1/995-short-enums.diff
 create mode 100644 
toolchain/gcc/patches/4.3.1/998-gcc-4.3.0-fix-header.00.patch
 create mode 100644 toolchain/gcc/patches/4.3.1/999-cf.patch
 create mode 100644 toolchain/gmp/Makefile
 create mode 100644 toolchain/mpfr/Makefile

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index e712d59..e0aae26 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -36,6 +36,9 @@ choice
                depends !LINUX_2_4
                bool "gcc 4.2.4"
 
+       config GCC_VERSION_4_3_1
+               depends !LINUX_2_4
+               bool "gcc 4.3.1"
 endchoice
 
 config EABI_SUPPORT
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 6da1e95..90a7d40 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -7,8 +7,26 @@ config GCC_VERSION
        default "4.2.2"     if GCC_VERSION_4_2_2
        default "4.2.3"     if GCC_VERSION_4_2_3
        default "4.2.4"     if GCC_VERSION_4_2_4
+       default "4.3.0"     if GCC_VERSION_4_3_0
+       default "4.3.1"     if GCC_VERSION_4_3_1
        default "4.1.2"
 
+config GCC_VERSION_3_4_X
+       bool
+       default y if GCC_VERSION_3_4_6
+
+config GCC_VERSION_4_1_X
+       bool
+       default y if GCC_VERSION_4_1_2
+
+config GCC_VERSION_4_2_X
+       bool
+       default y if GCC_VERSION_4_2_0 || GCC_VERSION_4_2_1 || 
GCC_VERSION_4_2_2 || GCC_VERSION_4_2_3 || GCC_VERSION_4_2_4
+
+config GCC_VERSION_4_3_X
+       bool
+       default y if GCC_VERSION_4_3_0 || GCC_VERSION_4_3_1
+
 if !TOOLCHAINOPTS
        config GCC_VERSION_3_4_6
                default y if LINUX_2_4
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index ef5ab22..cd0203f 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -42,6 +42,18 @@ TARGET_LANGUAGES:="c$(if 
$(CONFIG_INSTALL_LIBSTDCPP),$(SEP)c++)$(if $(CONFIG_INS
 
 EXTRA_TARGET=$(if $(CONFIG_EXTRA_TARGET_ARCH),--enable-biarch 
--enable-targets=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-linux-uclibc)
 
+ifeq ($(ARCH),m68k) 
+SOFT_FLOAT_CONFIG_OPTION:= 
+else 
+SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft 
+endif
+
+#ifeq ($(CONFIG_GCC_VERSION_4_3_1),)
+#WITH_GMP_MPFR:=
+#else
+#WITH_GMP_MPFR:=--with-mpfr=$(TOPDIR)/staging_dir/host 
--with-gmp=$(TOPDIR)/staging_dir/host
+#endif
+
 define Stage1/Configure
        $(SED) 's,TARGET_CROSS=.*,TARGET_CROSS=$(REAL_GNU_TARGET_NAME)-,' 
$(TOOLCHAIN_DIR)/info.mk
        $(SED) 's,GCC_VERSION=.*,GCC_VERSION=$(PKG_VERSION),' 
$(TOOLCHAIN_DIR)/info.mk
@@ -64,15 +76,30 @@ define Stage1/Configure
                --disable-multilib \
                $(EXTRA_TARGET) \
                $(SOFT_FLOAT_CONFIG_OPTION) \
+               $(WITH_GMP_MPFR) \
                $(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \
        );
 endef
+
+ifeq ($(CONFIG_GCC_VERSION_4_3_1),)
 define Stage1/Compile
        export SHELL="$(BASH)"; $(MAKE) -C $(BUILD_DIR1) all-gcc
 endef
+else
+define Stage1/Compile
+       export SHELL="$(BASH)"; $(MAKE) -C $(BUILD_DIR1) all-gcc 
all-target-libgcc
+endef
+endif
+
+ifeq ($(CONFIG_GCC_VERSION_4_3_1),)
 define Stage1/Install
        export SHELL="$(BASH)"; $(MAKE) -C $(BUILD_DIR1) install-gcc
 endef
+else
+define Stage1/Install
+       export SHELL="$(BASH)"; $(MAKE) -C $(BUILD_DIR1) install-gcc 
install-target-libgcc
+endef
+endif
 
 define Stage2/Configure
        mkdir -p $(BUILD_DIR2) $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)
@@ -98,6 +125,7 @@ define Stage2/Configure
                --disable-multilib \
                $(EXTRA_TARGET) \
                $(SOFT_FLOAT_CONFIG_OPTION) \
+               $(WITH_GMP_MPFR) \
                $(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \
        );
 endef
diff --git a/toolchain/gcc/patches/4.3.1/100-uclibc-conf.patch 
b/toolchain/gcc/patches/4.3.1/100-uclibc-conf.patch
new file mode 100644
index 0000000..cca8c82
--- /dev/null
+++ b/toolchain/gcc/patches/4.3.1/100-uclibc-conf.patch
@@ -0,0 +1,33 @@
+--- gcc/gcc/config/--- gcc/contrib/regression/objs-gcc.sh
++++ gcc/contrib/regression/objs-gcc.sh
+@@ -105,6 +105,10 @@
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc 
]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
+--- gcc/libjava/classpath/ltconfig
++++ gcc/libjava/classpath/ltconfig
+@@ -603,7 +603,7 @@
+ 
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case $host_os in
+-linux-gnu*) ;;
++linux-gnu*|linux-uclibc*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+ 
+@@ -1251,7 +1251,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
diff --git a/toolchain/gcc/patches/4.3.1/104-gnuhurd-uclibc-conf.patch 
b/toolchain/gcc/patches/4.3.1/104-gnuhurd-uclibc-conf.patch
new file mode 100644
index 0000000..c04dd9f
--- /dev/null
+++ b/toolchain/gcc/patches/4.3.1/104-gnuhurd-uclibc-conf.patch
@@ -0,0 +1,13 @@
+diff -rdup gcc-4.2.1.oorig/gcc/config.gcc gcc-4.2.1/gcc/config.gcc
+--- gcc-4.2.1.oorig/gcc/config.gcc     2007-10-01 11:52:52.000000000 +0200
++++ gcc-4.2.1/gcc/config.gcc   2007-10-01 13:22:12.000000000 +0200
+@@ -494,6 +494,9 @@ case ${target} in
+     alpha*)
+       tm_file="${cpu_type}/${cpu_type}.h alpha/elf.h alpha/linux.h 
alpha/linux-elf.h gnu.h ${tm_file}"
+       ;;
++    i[34567]86-*hurd*-*)
++      tm_file="${cpu_type}/${cpu_type}.h i386/unix.h i386/att.h dbxelf.h 
elfos.h svr4.h i386/gnu.h gnu.h ${tm_file}"
++      ;;
+     i[34567]86-*-*)
+       tm_file="${cpu_type}/${cpu_type}.h i386/unix.h i386/att.h dbxelf.h 
elfos.h svr4.h linux.h i386/linux.h gnu.h ${tm_file}"
+       ;;
diff --git a/toolchain/gcc/patches/4.3.1/301-missing-execinfo_h.patch 
b/toolchain/gcc/patches/4.3.1/301-missing-execinfo_h.patch
new file mode 100644
index 0000000..0e2092f
--- /dev/null
+++ b/toolchain/gcc/patches/4.3.1/301-missing-execinfo_h.patch
@@ -0,0 +1,11 @@
+--- gcc-4.0.0/boehm-gc/include/gc.h-orig       2005-04-28 22:28:57.000000000 
-0500
++++ gcc-4.0.0/boehm-gc/include/gc.h    2005-04-28 22:30:38.000000000 -0500
+@@ -500,7 +500,7 @@
+ #ifdef __linux__
+ # include <features.h>
+ # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
+-     && !defined(__ia64__)
++     && !defined(__ia64__) && !defined(__UCLIBC__)
+ #   ifndef GC_HAVE_BUILTIN_BACKTRACE
+ #     define GC_HAVE_BUILTIN_BACKTRACE
+ #   endif
diff --git a/toolchain/gcc/patches/4.3.1/302-c99-snprintf.patch 
b/toolchain/gcc/patches/4.3.1/302-c99-snprintf.patch
new file mode 100644
index 0000000..ba51a0e
--- /dev/null
+++ b/toolchain/gcc/patches/4.3.1/302-c99-snprintf.patch
@@ -0,0 +1,13 @@
+Index: gcc-4.3.0/libstdc++-v3/include/c_global/cstdio
+===================================================================
+--- gcc-4.3.0/libstdc++-v3/include/c_global/cstdio     (revision 129202)
++++ gcc-4.3.0/libstdc++-v3/include/c_global/cstdio     (working copy)
+@@ -144,7 +144,7 @@
+ 
+ _GLIBCXX_END_NAMESPACE
+ 
+-#if _GLIBCXX_USE_C99
++#if _GLIBCXX_USE_C99 || defined __UCLIBC__
+ 
+ #undef snprintf
+ #undef vfscanf
diff --git a/toolchain/gcc/patches/4.3.1/305-libmudflap-susv3-legacy.patch 
b/toolchain/gcc/patches/4.3.1/305-libmudflap-susv3-legacy.patch
new file mode 100644
index 0000000..374b1f8
--- /dev/null
+++ b/toolchain/gcc/patches/4.3.1/305-libmudflap-susv3-legacy.patch
@@ -0,0 +1,49 @@
+Index: gcc-4.2/libmudflap/mf-hooks2.c
+===================================================================
+--- gcc-4.2/libmudflap/mf-hooks2.c     (revision 119834)
++++ gcc-4.2/libmudflap/mf-hooks2.c     (working copy)
+@@ -427,7 +427,7 @@
+ {
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
+-  bzero (s, n);
++  memset (s, 0, n);
+ }
+ 
+ 
+@@ -437,7 +437,7 @@
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
+   MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
+-  bcopy (src, dest, n);
++  memmove (dest, src, n);
+ }
+ 
+ 
+@@ -447,7 +447,7 @@
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
+   MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
+-  return bcmp (s1, s2, n);
++  return n == 0 ? 0 : memcmp (s1, s2, n);
+ }
+ 
+ 
+@@ -456,7 +456,7 @@
+   size_t n = strlen (s);
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
+-  return index (s, c);
++  return strchr (s, c);
+ }
+ 
+ 
+@@ -465,7 +465,7 @@
+   size_t n = strlen (s);
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
+-  return rindex (s, c);
++  return strrchr (s, c);
+ }
+ 
+ /* XXX:  stpcpy, memccpy */
diff --git a/toolchain/gcc/patches/4.3.1/810-arm-softfloat-libgcc.patch 
b/toolchain/gcc/patches/4.3.1/810-arm-softfloat-libgcc.patch
new file mode 100644
index 0000000..1639c39
--- /dev/null
+++ b/toolchain/gcc/patches/4.3.1/810-arm-softfloat-libgcc.patch
@@ -0,0 +1,29 @@
+Index: gcc-4.3.0/gcc/config/arm/t-linux
+===================================================================
+--- gcc-4.3.0/gcc/config/arm/t-linux   (revision 129896)
++++ gcc-4.3.0/gcc/config/arm/t-linux   (working copy)
+@@ -3,7 +3,10 @@
+ TARGET_LIBGCC2_CFLAGS = -fomit-frame-pointer -fPIC
+ 
+ LIB1ASMSRC = arm/lib1funcs.asm
+-LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx
++LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \
++      _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
++      _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
++      _fixsfsi _fixunssfsi _floatdidf _floatundidf _floatdisf _floatundisf
+ 
+ # MULTILIB_OPTIONS = mhard-float/msoft-float
+ # MULTILIB_DIRNAMES = hard-float soft-float
+Index: gcc-4.3.0/gcc/config/arm/linux-elf.h
+===================================================================
+--- gcc-4.3.0/gcc/config/arm/linux-elf.h       (revision 129896)
++++ gcc-4.3.0/gcc/config/arm/linux-elf.h       (working copy)
+@@ -48,7 +62,7 @@
+    %{shared:-lc} \
+    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
+ 
+-#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
++#define LIBGCC_SPEC "-lgcc"
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
diff --git a/toolchain/gcc/patches/4.3.1/910-mbsd_multi.patch 
b/toolchain/gcc/patches/4.3.1/910-mbsd_multi.patch
new file mode 100644
index 0000000..481367f
--- /dev/null
+++ b/toolchain/gcc/patches/4.3.1/910-mbsd_multi.patch
@@ -0,0 +1,284 @@
+
+       This patch brings over a few features from MirBSD:
+       * -fhonour-copts
+         If this option is not given, it's warned (depending
+         on environment variables). This is to catch errors
+         of misbuilt packages which override CFLAGS themselves.
+       * -Werror-maybe-reset
+         Has the effect of -Wno-error if GCC_NO_WERROR is
+         set and not '0', a no-operation otherwise. This is
+         to be able to use -Werror in "make" but prevent
+         GNU autoconf generated configure scripts from
+         freaking out.
+       * Make -fno-strict-aliasing and -fno-delete-null-pointer-checks
+         the default for -O2/-Os, because they trigger gcc bugs
+         and can delete code with security implications.
+
+       This patch was authored by Thorsten Glaser <tg at mirbsd.de>
+       with copyright assignment to the FSF in effect.
+
+Index: gcc-4.3.0/gcc/c-opts.c
+===================================================================
+--- gcc-4.3.0.orig/gcc/c-opts.c        2007-07-31 02:27:12.007256629 +0200
++++ gcc-4.3.0/gcc/c-opts.c     2007-07-31 02:27:39.324813371 +0200
+@@ -108,6 +108,9 @@
+ /* Number of deferred options scanned for -include.  */
+ static size_t include_cursor;
+
++/* Check if a port honours COPTS.  */
++static int honour_copts = 0;
++
+ static void set_Wimplicit (int);
+ static void handle_OPT_d (const char *);
+ static void set_std_cxx98 (int);
+@@ -462,6 +465,14 @@
+       enable_warning_as_error ("implicit-function-declaration", value, CL_C | 
CL_ObjC);
+       break;
+
++    case OPT_Werror_maybe_reset:
++      {
++      char *ev = getenv ("GCC_NO_WERROR");
++      if ((ev != NULL) && (*ev != '0'))
++        cpp_opts->warnings_are_errors = 0;
++      }
++      break;
++
+     case OPT_Wformat:
+       set_Wformat (value);
+       break;
+@@ -708,6 +719,12 @@
+       flag_exceptions = value;
+       break;
+
++    case OPT_fhonour_copts:
++      if (c_language == clk_c) {
++      honour_copts++;
++      }
++      break;
++
+     case OPT_fimplement_inlines:
+       flag_implement_inlines = value;
+       break;
+@@ -1248,6 +1265,47 @@
+   /* Has to wait until now so that cpplib has its hash table.  */
+   init_pragma ();
+
++  if (c_language == clk_c) {
++    char *ev = getenv ("GCC_HONOUR_COPTS");
++    int evv;
++    if (ev == NULL)
++      evv = -1;
++    else if ((*ev == '0') || (*ev == '\0'))
++      evv = 0;
++    else if (*ev == '1')
++      evv = 1;
++    else if (*ev == '2')
++      evv = 2;
++    else if (*ev == 's')
++      evv = -1;
++    else {
++      warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1");
++      evv = 1; /* maybe depend this on something like MIRBSD_NATIVE?  */
++    }
++    if (evv == 1) {
++      if (honour_copts == 0) {
++      error ("someone does not honour COPTS at all in lenient mode");
++      return false;
++      } else if (honour_copts != 1) {
++      warning (0, "someone does not honour COPTS correctly, passed %d times",
++       honour_copts);
++      }
++    } else if (evv == 2) {
++      if (honour_copts == 0) {
++      error ("someone does not honour COPTS at all in strict mode");
++      return false;
++      } else if (honour_copts != 1) {
++      error ("someone does not honour COPTS correctly, passed %d times",
++       honour_copts);
++      return false;
++      }
++    } else if (evv == 0) {
++      if (honour_copts != 1)
++      inform ("someone does not honour COPTS correctly, passed %d times",
++       honour_copts);
++    }
++  }
++
+   return true;
+ }
+
+Index: gcc-4.3.0/gcc/c.opt
+===================================================================
+--- gcc-4.3.0.orig/gcc/c.opt   2007-07-31 02:27:12.015257093 +0200
++++ gcc-4.3.0/gcc/c.opt        2007-07-31 02:27:39.328813597 +0200
+@@ -207,6 +207,10 @@
+ C ObjC RejectNegative Warning
+ This switch is deprecated; use -Werror=implicit-function-declaration instead
+
++Werror-maybe-reset
++C ObjC C++ ObjC++
++; Documented in common.opt
++
+ Wfloat-equal
+ C ObjC C++ ObjC++ Var(warn_float_equal) Warning
+ Warn if testing floating point numbers for equality
+@@ -590,6 +594,9 @@
+ fhonor-std
+ C++ ObjC++
+
++fhonour-copts
++C ObjC C++ ObjC++ RejectNegative
++
+ fhosted
+ C ObjC
+ Assume normal C execution environment
+Index: gcc-4.3.0/gcc/common.opt
+===================================================================
+--- gcc-4.3.0.orig/gcc/common.opt      2007-07-31 02:27:12.023257546 +0200
++++ gcc-4.3.0/gcc/common.opt   2007-07-31 02:27:39.360815422 +0200
+@@ -102,6 +102,10 @@
+ Common Joined
+ Treat specified warning as error
+
++Werror-maybe-reset
++Common
++If environment variable GCC_NO_WERROR is set, act as -Wno-error
++
+ Wextra
+ Common Warning
+ Print extra (possibly unwanted) warnings
+@@ -528,6 +532,9 @@
+ Common Report Var(flag_guess_branch_prob) Optimization
+ Enable guessing of branch probabilities
+
++fhonour-copts
++Common RejectNegative
++
+ ; Nonzero means ignore `#ident' directives.  0 means handle them.
+ ; Generate position-independent code for executables if possible
+ ; On SVR4 targets, it also controls whether or not to emit a
+Index: gcc-4.3.0/gcc/opts.c
+===================================================================
+--- gcc-4.3.0.orig/gcc/opts.c  2007-07-31 02:27:12.031257991 +0200
++++ gcc-4.3.0/gcc/opts.c       2007-07-31 02:28:36.320061346 +0200
+@@ -830,9 +830,6 @@
+       flag_schedule_insns_after_reload = 1;
+ #endif
+       flag_regmove = 1;
+-      flag_strict_aliasing = 1;
+-      flag_strict_overflow = 1;
+-      flag_delete_null_pointer_checks = 1;
+       flag_reorder_blocks = 1;
+       flag_reorder_functions = 1;
+       flag_tree_store_ccp = 1;
+@@ -850,6 +847,10 @@
+
+   if (optimize >= 3)
+     {
++      flag_strict_aliasing = 1;
++      flag_strict_overflow = 1;
++      flag_delete_null_pointer_checks = 1;
++
+       flag_predictive_commoning = 1;
+       flag_inline_functions = 1;
+       flag_unswitch_loops = 1;
+@@ -1441,6 +1442,17 @@
+       enable_warning_as_error (arg, value, lang_mask);
+       break;
+
++    case OPT_Werror_maybe_reset:
++      {
++      char *ev = getenv ("GCC_NO_WERROR");
++      if ((ev != NULL) && (*ev != '0'))
++        warnings_are_errors = 0;
++      }
++      break;
++
++    case OPT_fhonour_copts:
++      break;
++
+     case OPT_Wextra:
+       set_Wextra (value);
+       break;
+Index: gcc-4.3.0/gcc/doc/cppopts.texi
+===================================================================
+--- gcc-4.3.0.orig/gcc/doc/cppopts.texi        2007-07-31 02:27:12.039258455 
+0200
++++ gcc-4.3.0/gcc/doc/cppopts.texi     2007-07-31 02:27:39.408818157 +0200
+@@ -168,6 +168,11 @@
+ Make all warnings into hard errors.  Source code which triggers warnings
+ will be rejected.
+
++ at item -Werror-maybe-reset
++ at opindex Werror-maybe-reset
++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
++variable is set to anything other than 0 or empty.
++
+ @item -Wsystem-headers
+ @opindex Wsystem-headers
+ Issue warnings for code in system headers.  These are normally unhelpful
+Index: gcc-4.3.0/gcc/doc/invoke.texi
+===================================================================
+--- gcc-4.3.0.orig/gcc/doc/invoke.texi 2007-07-31 02:27:12.047258920 +0200
++++ gcc-4.3.0/gcc/doc/invoke.texi      2007-07-31 02:29:13.218164047 +0200
+@@ -233,7 +233,7 @@
+ -Wconversion  -Wcoverage-mismatch  -Wno-deprecated-declarations @gol
+ -Wdisabled-optimization  -Wno-div-by-zero  @gol
+ -Wempty-body  -Wno-endif-labels @gol
+--Werror  -Werror=* @gol
++-Werror  -Werror=* -Werror-maybe-reset @gol
+ -Wfatal-errors  -Wfloat-equal  -Wformat  -Wformat=2 @gol
+ -Wno-format-extra-args -Wformat-nonliteral @gol
+ -Wformat-security  -Wformat-y2k -Wignored-qualifiers @gol
+@@ -4030,6 +4030,22 @@
+ @option{-Wall} and by @option{-pedantic}, which can be disabled with
+ @option{-Wno-pointer-sign}.
+
++ at item -Werror-maybe-reset
++ at opindex Werror-maybe-reset
++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
++variable is set to anything other than 0 or empty.
++
++ at item -fhonour-copts
++ at opindex fhonour-copts
++If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not
++given at least once, and warn if it is given more than once.
++If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not
++given exactly once.
++If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option
++is not given exactly once.
++The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}.
++This flag and environment variable only affect the C language.
++
+ @item -Wstack-protector
+ @opindex Wstack-protector
+ @opindex Wno-stack-protector
+@@ -5490,7 +5806,7 @@
+ second branch or a point immediately following it, depending on whether
+ the condition is known to be true or false.
+
+-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}.
++Enabled at levels @option{-O3}.
+
+ @item -fsplit-wide-types
+ @opindex fsplit-wide-types
+@@ -5635,7 +5514,7 @@
+ @option{-fno-delete-null-pointer-checks} to disable this optimization
+ for programs which depend on that behavior.
+
+-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}.
++Enabled at levels @option{-O3}.
+
+ @item -fexpensive-optimizations
+ @opindex fexpensive-optimizations
+Index: gcc-4.3.0/gcc/java/jvspec.c
+===================================================================
+--- gcc-4.3.0.orig/gcc/java/jvspec.c   2007-07-31 02:27:12.055259364 +0200
++++ gcc-4.3.0/gcc/java/jvspec.c        2007-07-31 02:27:39.484822490 +0200
+@@ -670,6 +670,7 @@
+      class name.  Append dummy `.c' that can be stripped by set_input so %b
+      is correct.  */
+   set_input (concat (main_class_name, "main.c", NULL));
++  putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack!  */
+   err = do_spec (jvgenmain_spec);
+   if (err == 0)
+     {
diff --git 
a/toolchain/gcc/patches/4.3.1/993-arm_insn-opinit-RTX_CODE-fixup.patch 
b/toolchain/gcc/patches/4.3.1/993-arm_insn-opinit-RTX_CODE-fixup.patch
new file mode 100644
index 0000000..69f0c37
--- /dev/null
+++ b/toolchain/gcc/patches/4.3.1/993-arm_insn-opinit-RTX_CODE-fixup.patch
@@ -0,0 +1,41 @@
+gcc/ChangeLog
+2007-11-27  Bernhard Fischer  <>
+
+       * config/arm/arm-protos.h (arm_vector_mode_supported_p,
+       arm_hard_regno_mode_ok, const_ok_for_arm): Do not hide non-rtx related
+       function prototypes in RTX_CODE.
+       * genopinit.c: Include tm_p.h.
+
+Index: gcc-4.3.0/gcc/config/arm/arm-protos.h
+===================================================================
+--- gcc-4.3.0/gcc/config/arm/arm-protos.h      (revision 130463)
++++ gcc-4.3.0/gcc/config/arm/arm-protos.h      (working copy)
+@@ -40,15 +40,14 @@
+                                                              unsigned int);
+ extern unsigned int arm_dbx_register_number (unsigned int);
+ extern void arm_output_fn_unwind (FILE *, bool);
+-  
+ 
+ #ifdef TREE_CODE
+ extern int arm_return_in_memory (const_tree);
+ #endif
+-#ifdef RTX_CODE
+ extern bool arm_vector_mode_supported_p (enum machine_mode);
+ extern int arm_hard_regno_mode_ok (unsigned int, enum machine_mode);
+ extern int const_ok_for_arm (HOST_WIDE_INT);
++#ifdef RTX_CODE
+ extern int arm_split_constant (RTX_CODE, enum machine_mode, rtx,
+                              HOST_WIDE_INT, rtx, rtx, int);
+ extern RTX_CODE arm_canonicalize_comparison (RTX_CODE, enum machine_mode,
+Index: gcc-4.3.0/gcc/genopinit.c
+===================================================================
+--- gcc-4.3.0/gcc/genopinit.c  (revision 130463)
++++ gcc-4.3.0/gcc/genopinit.c  (working copy)
+@@ -486,6 +486,7 @@
+   printf ("#include \"expr.h\"\n");
+   printf ("#include \"optabs.h\"\n");
+   printf ("#include \"reload.h\"\n\n");
++  printf ("#include \"tm_p.h\"\n\n");
+ 
+   printf ("void\ninit_all_optabs (void)\n{\n");
+ 
diff --git a/toolchain/gcc/patches/4.3.1/995-short-enums.diff 
b/toolchain/gcc/patches/4.3.1/995-short-enums.diff
new file mode 100644
index 0000000..03c470c
--- /dev/null
+++ b/toolchain/gcc/patches/4.3.1/995-short-enums.diff
@@ -0,0 +1,42 @@
+see gcc PR34205
+Index: gcc-4.3.0/gcc/tree.h
+===================================================================
+--- gcc-4.3.0/gcc/tree.h       (revision 130511)
++++ gcc-4.3.0/gcc/tree.h       (working copy)
+@@ -38,6 +38,7 @@
+ 
+   LAST_AND_UNUSED_TREE_CODE   /* A convenient way to get a value for
+                                  NUM_TREE_CODES.  */
++  ,__LAST_AND_UNUSED_TREE_CODE=32767 /* Force 16bit width.  */
+ };
+ 
+ #undef DEFTREECODE
+Index: gcc-4.3.0/gcc/rtl.h
+===================================================================
+--- gcc-4.3.0/gcc/rtl.h        (revision 130511)
++++ gcc-4.3.0/gcc/rtl.h        (working copy)
+@@ -48,9 +48,11 @@
+ #include "rtl.def"            /* rtl expressions are documented here */
+ #undef DEF_RTL_EXPR
+ 
+-  LAST_AND_UNUSED_RTX_CODE};  /* A convenient way to get a value for
++  LAST_AND_UNUSED_RTX_CODE    /* A convenient way to get a value for
+                                  NUM_RTX_CODE.
+                                  Assumes default enum value assignment.  */
++  ,__LAST_AND_UNUSED_RTX_CODE=32767 /* Force 16bit width.  */
++};
+ 
+ #define NUM_RTX_CODE ((int) LAST_AND_UNUSED_RTX_CODE)
+                               /* The cast here, saves many elsewhere.  */
+Index: gcc-4.3.0/gcc/c-common.h
+===================================================================
+--- gcc-4.3.0/gcc/c-common.h   (revision 130511)
++++ gcc-4.3.0/gcc/c-common.h   (working copy)
+@@ -125,6 +125,7 @@
+   RID_LAST_AT = RID_AT_IMPLEMENTATION,
+   RID_FIRST_PQ = RID_IN,
+   RID_LAST_PQ = RID_ONEWAY
++  ,__LAST_AND_UNUSED_RID=32767 /* Force 16bit width.  */
+ };
+ 
+ #define OBJC_IS_AT_KEYWORD(rid) \
diff --git a/toolchain/gcc/patches/4.3.1/998-gcc-4.3.0-fix-header.00.patch 
b/toolchain/gcc/patches/4.3.1/998-gcc-4.3.0-fix-header.00.patch
new file mode 100644
index 0000000..7fe59d2
--- /dev/null
+++ b/toolchain/gcc/patches/4.3.1/998-gcc-4.3.0-fix-header.00.patch
@@ -0,0 +1,15 @@
+\\\\
+\\ gcc PR33200
+Index: gcc-4.3.0/gcc/config.gcc
+===================================================================
+--- gcc-4.3.0/gcc/config.gcc   (revision 131628)
++++ gcc-4.3.0/gcc/config.gcc   (working copy)
+@@ -2302,7 +2305,7 @@ sh-*-symbianelf* | sh[12346l]*-*-symbian
+       if test x${enable_incomplete_targets} = xyes ; then
+               tm_defines="$tm_defines SUPPORT_SH1=1 SUPPORT_SH2E=1 
SUPPORT_SH4=1 SUPPORT_SH4_SINGLE=1 SUPPORT_SH2A=1 SUPPORT_SH2A_SINGLE=1 
SUPPORT_SH5_32MEDIA=1 SUPPORT_SH5_32MEDIA_NOFPU=1 SUPPORT_SH5_64MEDIA=1 
SUPPORT_SH5_64MEDIA_NOFPU=1"
+       fi
+-      use_fixproto=yes
++      # XXX: why? use_fixproto=yes
+       ;;
+ sh-*-rtemscoff*)
+       tmake_file="sh/t-sh t-rtems sh/t-rtems"
diff --git a/toolchain/gcc/patches/4.3.1/999-cf.patch 
b/toolchain/gcc/patches/4.3.1/999-cf.patch
new file mode 100644
index 0000000..2968e8d
--- /dev/null
+++ b/toolchain/gcc/patches/4.3.1/999-cf.patch
@@ -0,0 +1,10 @@
+--- gcc-4.3.1/gcc/config.gcc.old       2008-06-17 23:49:00.000000000 +0200
++++ gcc-4.3.1/gcc/config.gcc   2008-06-17 23:03:07.000000000 +0200
+@@ -1630,6 +1630,7 @@
+       if test x$sjlj != x1; then
+           tmake_file="$tmake_file m68k/t-slibgcc-elf-ver"
+       fi
++      tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-m68kelf"
+       ;;
+ m68k-*-rtems*)
+       default_m68k_cpu=68020
diff --git a/toolchain/gmp/Makefile b/toolchain/gmp/Makefile
new file mode 100644
index 0000000..c65069a
--- /dev/null
+++ b/toolchain/gmp/Makefile
@@ -0,0 +1,46 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2008 Luigi 'Comio' Mantellini <[EMAIL PROTECTED]>
+#                    Industrie Dial Face S.p.A. 
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gmp
+PKG_VERSION:=4.2.2
+
+PKG_SOURCE_URL:=http://ftp.sunet.se/pub/gnu/gmp/ \
+               ftp://ftp.gnu.org/gnu/gmp/
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PATCH_DIR:=./patches/$(PKG_VERSION)
+# STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
+BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Build/Configure
+       (cd $(BUILD_DIR_HOST); \
+        ln -sf $(PKG_NAME)-$(PKG_VERSION) $(PKG_NAME) \
+       );
+       (cd $(PKG_BUILD_DIR); \
+               ./configure \
+               --enable-fft \
+               --build=$(GNU_HOST_NAME) \
+               --host=$(GNU_HOST_NAME) \
+               --prefix=$(STAGING_DIR_HOST) \
+       );
+endef
+
+define Build/Compile
+       $(MAKE) -C $(PKG_BUILD_DIR)
+       $(MAKE) -C $(PKG_BUILD_DIR) check
+endef
+
+define Build/Install
+       $(MAKE) -C $(PKG_BUILD_DIR) install
+endef
+
+$(eval $(call HostBuild))
\ No newline at end of file
diff --git a/toolchain/mpfr/Makefile b/toolchain/mpfr/Makefile
new file mode 100644
index 0000000..19d3cac
--- /dev/null
+++ b/toolchain/mpfr/Makefile
@@ -0,0 +1,46 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2008 Luigi 'Comio' Mantellini <[EMAIL PROTECTED]>
+#                    Industrie Dial Face S.p.A. 
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mpfr
+PKG_VERSION:=2.3.1
+
+PKG_SOURCE_URL:=http://www.mpfr.org/mpfr-current/
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PATCH_DIR:=./patches/$(PKG_VERSION)
+# STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
+BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Build/Configure
+       (cd $(BUILD_DIR_HOST); \
+                ln -sf $(PKG_NAME)-$(PKG_VERSION) $(PKG_NAME) \
+       );                         
+       (cd $(PKG_BUILD_DIR); \
+               ./configure \
+               --build=$(GNU_HOST_NAME) \
+               --host=$(GNU_HOST_NAME) \
+               --prefix=$(STAGING_DIR_HOST) \
+               --with-gmp-build=$(BUILD_DIR_HOST)/gmp \
+               --with-gmp=$(STAGING_DIR_HOST) \
+       );
+endef
+
+define Build/Compile
+       $(MAKE) -C $(PKG_BUILD_DIR)
+#      $(MAKE) -C $(PKG_BUILD_DIR) check
+endef
+
+define Build/Install
+       $(MAKE) -C $(PKG_BUILD_DIR) install
+endef
+
+$(eval $(call HostBuild))
\ No newline at end of file
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 5efc74c..37bc646 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -145,6 +145,11 @@ UCLIBC_MAKE := PATH=$(TARGET_PATH) $(MAKE) -C 
$(PKG_BUILD_DIR) \
        CPU_CFLAGS="$(TARGET_CFLAGS)"
 
 define Build/Compile
+
+ifneq ($(CONFIG_GCC_VERSION_4_3_X),)
+       ln -sf 
$(TOOLCHAIN_DIR)/lib/gcc/m68k-linux-uclibc/$(CONFIG_GCC_VERSION)/include-fixed/limits.h
 \
+              
$(TOOLCHAIN_DIR)/lib/gcc/m68k-linux-uclibc/$(CONFIG_GCC_VERSION)/include/limits.h
+endif
        $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(PKG_BUILD_DIR)/Rules.mak
        $(UCLIBC_MAKE) PREFIX= all
        $(UCLIBC_MAKE) PREFIX=$(STAGING_DIR_HOST)/ install_runtime install_dev
-- 
1.5.4.3

_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Reply via email to