aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/gmp/gmp.mk2
-rw-r--r--package/mpfr/mpfr.mk2
-rw-r--r--toolchain/gcc/4.2.0/100-uclibc-conf.patch (renamed from toolchain/gcc/4.2/100-uclibc-conf.patch)0
-rw-r--r--toolchain/gcc/4.2.0/103-uclibc-conf-noupstream.patch (renamed from toolchain/gcc/4.2/103-uclibc-conf-noupstream.patch)0
-rw-r--r--toolchain/gcc/4.2.0/200-uclibc-locale.patch (renamed from toolchain/gcc/4.2/200-uclibc-locale.patch)0
-rw-r--r--toolchain/gcc/4.2.0/203-uclibc-locale-no__x.patch (renamed from toolchain/gcc/4.2/203-uclibc-locale-no__x.patch)0
-rw-r--r--toolchain/gcc/4.2.0/204-uclibc-locale-wchar_fix.patch (renamed from toolchain/gcc/4.2/204-uclibc-locale-wchar_fix.patch)0
-rw-r--r--toolchain/gcc/4.2.0/205-uclibc-locale-update.patch (renamed from toolchain/gcc/4.2/205-uclibc-locale-update.patch)0
-rw-r--r--toolchain/gcc/4.2.0/300-libstdc++-pic.patch (renamed from toolchain/gcc/4.2/300-libstdc++-pic.patch)0
-rw-r--r--toolchain/gcc/4.2.0/301-missing-execinfo_h.patch (renamed from toolchain/gcc/4.2/301-missing-execinfo_h.patch)0
-rw-r--r--toolchain/gcc/4.2.0/302-c99-snprintf.patch (renamed from toolchain/gcc/4.2/302-c99-snprintf.patch)0
-rw-r--r--toolchain/gcc/4.2.0/303-c99-complex-ugly-hack.patch (renamed from toolchain/gcc/4.2/303-c99-complex-ugly-hack.patch)0
-rw-r--r--toolchain/gcc/4.2.0/304-index_macro.patch (renamed from toolchain/gcc/4.2/304-index_macro.patch)0
-rw-r--r--toolchain/gcc/4.2.0/305-libmudflap-susv3-legacy.patch (renamed from toolchain/gcc/4.2/305-libmudflap-susv3-legacy.patch)0
-rw-r--r--toolchain/gcc/4.2.0/306-libstdc++-namespace.patch (renamed from toolchain/gcc/4.2/306-libstdc++-namespace.patch)0
-rw-r--r--toolchain/gcc/4.2.0/402-libbackend_dep_gcov-iov.h.patch (renamed from toolchain/gcc/4.2/402-libbackend_dep_gcov-iov.h.patch)0
-rw-r--r--toolchain/gcc/4.2.0/800-arm-bigendian.patch (renamed from toolchain/gcc/4.2/800-arm-bigendian.patch)0
-rw-r--r--toolchain/gcc/Config.in17
-rw-r--r--toolchain/gcc/gcc-uclibc-3.x.mk12
-rw-r--r--toolchain/gdb/Config.in2
20 files changed, 22 insertions, 13 deletions
diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index 18304cd7c4..38e30907bc 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -86,7 +86,7 @@ $(STAGING_DIR)/lib/$(GMP_BINARY): $(GMP_TARGET_DIR)/.libs/$(GMP_BINARY)
infodir=$(STAGING_DIR)/info \
mandir=$(STAGING_DIR)/man \
-C $(GMP_TARGET_DIR) install
- $(STRIP) --strip-unneeded $(STAGING_DIR)/lib/libgmp.{so*,a}
+ $(STRIP) --strip-unneeded $(STAGING_DIR)/lib/libgmp$(LIBTGTEXT)*
$(TARGET_DIR)/lib/libgmp.so $(TARGET_DIR)/lib/libgmp.so.$(GMP_LIBVERSION) $(TARGET_DIR)/lib/libgmp.a: $(STAGING_DIR)/lib/$(GMP_BINARY)
cp -dpf $(STAGING_DIR)/lib/libgmp$(LIBTGTEXT) $(TARGET_DIR)/lib/
diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
index 76b45d3d75..cdb0270018 100644
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -100,7 +100,7 @@ $(STAGING_DIR)/lib/$(MPFR_BINARY): $(MPFR_TARGET_DIR)/.libs/$(MPFR_BINARY)
infodir=$(STAGING_DIR)/info \
mandir=$(STAGING_DIR)/man \
-C $(MPFR_TARGET_DIR) install;
- $(STRIP) --strip-unneeded $(STAGING_DIR)/lib/libmpfr.{so*,a}
+ $(STRIP) --strip-unneeded $(STAGING_DIR)/lib/libmpfr$(LIBTGTEXT)*
$(TARGET_DIR)/lib/libmpfr.so $(TARGET_DIR)/lib/libmpfr.so.$(MPFR_LIBVERSION) $(TARGET_DIR)/lib/libmpfr.a: $(STAGING_DIR)/lib/$(MPFR_BINARY)
cp -dpf $(STAGING_DIR)/lib/libmpfr$(LIBTGTEXT) $(TARGET_DIR)/lib/
diff --git a/toolchain/gcc/4.2/100-uclibc-conf.patch b/toolchain/gcc/4.2.0/100-uclibc-conf.patch
index 4243ff7b91..4243ff7b91 100644
--- a/toolchain/gcc/4.2/100-uclibc-conf.patch
+++ b/toolchain/gcc/4.2.0/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.2/103-uclibc-conf-noupstream.patch b/toolchain/gcc/4.2.0/103-uclibc-conf-noupstream.patch
index 09c9bbecfb..09c9bbecfb 100644
--- a/toolchain/gcc/4.2/103-uclibc-conf-noupstream.patch
+++ b/toolchain/gcc/4.2.0/103-uclibc-conf-noupstream.patch
diff --git a/toolchain/gcc/4.2/200-uclibc-locale.patch b/toolchain/gcc/4.2.0/200-uclibc-locale.patch
index c933d1c446..c933d1c446 100644
--- a/toolchain/gcc/4.2/200-uclibc-locale.patch
+++ b/toolchain/gcc/4.2.0/200-uclibc-locale.patch
diff --git a/toolchain/gcc/4.2/203-uclibc-locale-no__x.patch b/toolchain/gcc/4.2.0/203-uclibc-locale-no__x.patch
index 6ba47003b3..6ba47003b3 100644
--- a/toolchain/gcc/4.2/203-uclibc-locale-no__x.patch
+++ b/toolchain/gcc/4.2.0/203-uclibc-locale-no__x.patch
diff --git a/toolchain/gcc/4.2/204-uclibc-locale-wchar_fix.patch b/toolchain/gcc/4.2.0/204-uclibc-locale-wchar_fix.patch
index 160ab35bb3..160ab35bb3 100644
--- a/toolchain/gcc/4.2/204-uclibc-locale-wchar_fix.patch
+++ b/toolchain/gcc/4.2.0/204-uclibc-locale-wchar_fix.patch
diff --git a/toolchain/gcc/4.2/205-uclibc-locale-update.patch b/toolchain/gcc/4.2.0/205-uclibc-locale-update.patch
index 86b2844554..86b2844554 100644
--- a/toolchain/gcc/4.2/205-uclibc-locale-update.patch
+++ b/toolchain/gcc/4.2.0/205-uclibc-locale-update.patch
diff --git a/toolchain/gcc/4.2/300-libstdc++-pic.patch b/toolchain/gcc/4.2.0/300-libstdc++-pic.patch
index 560bcb237b..560bcb237b 100644
--- a/toolchain/gcc/4.2/300-libstdc++-pic.patch
+++ b/toolchain/gcc/4.2.0/300-libstdc++-pic.patch
diff --git a/toolchain/gcc/4.2/301-missing-execinfo_h.patch b/toolchain/gcc/4.2.0/301-missing-execinfo_h.patch
index 0e2092f3fb..0e2092f3fb 100644
--- a/toolchain/gcc/4.2/301-missing-execinfo_h.patch
+++ b/toolchain/gcc/4.2.0/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.2/302-c99-snprintf.patch b/toolchain/gcc/4.2.0/302-c99-snprintf.patch
index dfb22d681b..dfb22d681b 100644
--- a/toolchain/gcc/4.2/302-c99-snprintf.patch
+++ b/toolchain/gcc/4.2.0/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.2/303-c99-complex-ugly-hack.patch b/toolchain/gcc/4.2.0/303-c99-complex-ugly-hack.patch
index 2ccc80d9bb..2ccc80d9bb 100644
--- a/toolchain/gcc/4.2/303-c99-complex-ugly-hack.patch
+++ b/toolchain/gcc/4.2.0/303-c99-complex-ugly-hack.patch
diff --git a/toolchain/gcc/4.2/304-index_macro.patch b/toolchain/gcc/4.2.0/304-index_macro.patch
index d8e476555d..d8e476555d 100644
--- a/toolchain/gcc/4.2/304-index_macro.patch
+++ b/toolchain/gcc/4.2.0/304-index_macro.patch
diff --git a/toolchain/gcc/4.2/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/4.2.0/305-libmudflap-susv3-legacy.patch
index 374b1f8659..374b1f8659 100644
--- a/toolchain/gcc/4.2/305-libmudflap-susv3-legacy.patch
+++ b/toolchain/gcc/4.2.0/305-libmudflap-susv3-legacy.patch
diff --git a/toolchain/gcc/4.2/306-libstdc++-namespace.patch b/toolchain/gcc/4.2.0/306-libstdc++-namespace.patch
index 69587ca63a..69587ca63a 100644
--- a/toolchain/gcc/4.2/306-libstdc++-namespace.patch
+++ b/toolchain/gcc/4.2.0/306-libstdc++-namespace.patch
diff --git a/toolchain/gcc/4.2/402-libbackend_dep_gcov-iov.h.patch b/toolchain/gcc/4.2.0/402-libbackend_dep_gcov-iov.h.patch
index 0bf115c45d..0bf115c45d 100644
--- a/toolchain/gcc/4.2/402-libbackend_dep_gcov-iov.h.patch
+++ b/toolchain/gcc/4.2.0/402-libbackend_dep_gcov-iov.h.patch
diff --git a/toolchain/gcc/4.2/800-arm-bigendian.patch b/toolchain/gcc/4.2.0/800-arm-bigendian.patch
index 07c6093379..07c6093379 100644
--- a/toolchain/gcc/4.2/800-arm-bigendian.patch
+++ b/toolchain/gcc/4.2.0/800-arm-bigendian.patch
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index f834ed314a..f705f59eb5 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -4,7 +4,7 @@ comment "Gcc Options"
choice
prompt "GCC compiler Version"
- default BR2_GCC_VERSION_4_1_2
+ default BR2_GCC_VERSION_4_2_0
help
Select the version of gcc you wish to use.
@@ -67,10 +67,14 @@ choice
depends !BR2_nios2
bool "gcc 4.1.2"
- config BR2_GCC_VERSION_4_2
+ config BR2_GCC_VERSION_4_2_0
depends !BR2_nios2
- select BR2_GCC_IS_SNAP
- bool "gcc 4.2"
+ bool "gcc 4.2.0"
+
+# config BR2_GCC_VERSION_4_3
+# depends !BR2_nios2
+# select BR2_GCC_IS_SNAP
+# bool "gcc 4.3"
endchoice
@@ -80,7 +84,7 @@ config BR2_GCC_IS_SNAP
config BR2_GCC_SNAP_DATE
string "GCC snapshot date"
- default "20061121"
+ default "20070601"
depends BR2_GCC_IS_SNAP
help
Enter snapshot date to use for gcc. Format is:
@@ -103,7 +107,8 @@ config BR2_GCC_VERSION
default "4.1.0" if BR2_GCC_VERSION_4_1_0
default "4.1.1" if BR2_GCC_VERSION_4_1_1
default "4.1.2" if BR2_GCC_VERSION_4_1_2
- default "4.2" if BR2_GCC_VERSION_4_2
+ default "4.2.0" if BR2_GCC_VERSION_4_2_0
+ default "4.3" if BR2_GCC_VERSION_4_3
config BR2_GCC_USE_SJLJ_EXCEPTIONS
diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk
index e95e49ee29..8d6de7ed36 100644
--- a/toolchain/gcc/gcc-uclibc-3.x.mk
+++ b/toolchain/gcc/gcc-uclibc-3.x.mk
@@ -36,13 +36,17 @@ GCC_STRIP_HOST_BINARIES:=true
ifeq ($(findstring 3.,$(GCC_VERSION)),3.)
GCC_NO_MPFR:=y
-endif
+else
+ifneq ($(BR2_INSTALL_FORTRAN),y)
+# fortran needs gmp and mpfr
ifeq ($(findstring 4.0.,$(GCC_VERSION)),4.0.)
GCC_NO_MPFR:=y
endif
-#ifeq ($(findstring 4.1.,$(GCC_VERSION)),4.1.)
-#GCC_NO_MPFR:=y
-#endif
+ifeq ($(findstring 4.1.,$(GCC_VERSION)),4.1.)
+GCC_NO_MPFR:=y
+endif
+endif
+endif
#############################################################
#
diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index f8ae5af40c..b4f2cb83ab 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -22,7 +22,7 @@ config BR2_PACKAGE_GDB_HOST
choice
prompt "GDB debugger Version"
- default BR2_GDB_VERSION_6_3
+ default BR2_GDB_VERSION_6_6
depends on BR2_PACKAGE_GDB || BR2_PACKAGE_GDB_SERVER || BR2_PACKAGE_GDB_HOST
help
Select the version of gdb you wish to use.