From 2b7b8dd038afac7e9d634c511bebc0be04f68492 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 15 May 2013 10:36:16 +0200 Subject: [PATCH] Revert "gcc: move patches to versioned dir, add support for gcc-4.7, add options to choice gcc version, set per default to 4.8 except for RPi, disable GOLD for RPi, update to gcc-4.8-20130509" This reverts commit 1ef22aa1093e45490c50b5b055d01caa5499bfc0. Conflicts: projects/ARCTIC_MC/options projects/ATV/options projects/Fusion/options projects/Generic/options projects/Generic_OSS/options projects/ION/options projects/Intel/options projects/RPi/options projects/Ultra/options projects/Virtual/options --- packages/toolchain/lang/gcc/meta | 12 +- .../patches/4.7.3/gcc-4.7.3-cloog-0.17.patch | 24 ---- ...-4.7.3-disable_multilib_i386_linux64.patch | 13 -- .../4.7.3/gcc-4.7.3-dynamic_linker.patch | 131 ------------------ .../4.7.3/gcc-4.7.3-libstdc++-v3_config.patch | 97 ------------- .../patches/{4.8.0 => }/gcc-cloog-0.18.patch | 0 .../gcc-disable_multilib_i386_linux64.patch | 0 .../{4.8.0 => }/gcc-dynamic_linker.patch | 0 .../{4.8.0 => }/gcc-libstdc++-v3_config.patch | 0 projects/ARCTIC_MC/options | 4 - projects/ATV/options | 5 +- projects/Fusion/options | 4 - projects/Generic/options | 4 - projects/Generic_OSS/options | 4 - projects/ION/options | 4 - projects/Intel/options | 4 - projects/RPi/options | 6 +- projects/Ultra/options | 4 - projects/Virtual/options | 4 - 19 files changed, 4 insertions(+), 316 deletions(-) delete mode 100644 packages/toolchain/lang/gcc/patches/4.7.3/gcc-4.7.3-cloog-0.17.patch delete mode 100644 packages/toolchain/lang/gcc/patches/4.7.3/gcc-4.7.3-disable_multilib_i386_linux64.patch delete mode 100644 packages/toolchain/lang/gcc/patches/4.7.3/gcc-4.7.3-dynamic_linker.patch delete mode 100644 packages/toolchain/lang/gcc/patches/4.7.3/gcc-4.7.3-libstdc++-v3_config.patch rename packages/toolchain/lang/gcc/patches/{4.8.0 => }/gcc-cloog-0.18.patch (100%) rename packages/toolchain/lang/gcc/patches/{4.8.0 => }/gcc-disable_multilib_i386_linux64.patch (100%) rename packages/toolchain/lang/gcc/patches/{4.8.0 => }/gcc-dynamic_linker.patch (100%) rename packages/toolchain/lang/gcc/patches/{4.8.0 => }/gcc-libstdc++-v3_config.patch (100%) diff --git a/packages/toolchain/lang/gcc/meta b/packages/toolchain/lang/gcc/meta index c5fc7a1ece..a7435277e6 100644 --- a/packages/toolchain/lang/gcc/meta +++ b/packages/toolchain/lang/gcc/meta @@ -19,20 +19,12 @@ ################################################################################ PKG_NAME="gcc" -if [ "$GCC_VERSION" = "4.7" ]; then - PKG_VERSION="4.7.3" - PKG_URL="ftp://ftp.gnu.org/gnu/gcc/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" -else -# PKG_VERSION="4.8.0" -# PKG_URL="ftp://ftp.gnu.org/gnu/gcc/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" - PKG_VERSION="4.8-20130509" - PKG_URL="ftp://ftp.gwdg.de/pub/misc/gcc/snapshots/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" -fi +PKG_VERSION="4.8.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://gcc.gnu.org/" -# PKG_URL="ftp://ftp.gnu.org/gnu/gcc/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="ftp://ftp.gnu.org/gnu/gcc/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" PKG_BUILD_DEPENDS="ccache" PKG_PRIORITY="optional" diff --git a/packages/toolchain/lang/gcc/patches/4.7.3/gcc-4.7.3-cloog-0.17.patch b/packages/toolchain/lang/gcc/patches/4.7.3/gcc-4.7.3-cloog-0.17.patch deleted file mode 100644 index 49d43f1a0e..0000000000 --- a/packages/toolchain/lang/gcc/patches/4.7.3/gcc-4.7.3-cloog-0.17.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure ---- gcc-4.6-20120120-orig/configure 2011-12-18 20:03:44.000000000 +1000 -+++ gcc-4.6-20120120/configure 2012-02-03 17:55:14.885990135 +1000 -@@ -6049,8 +6049,8 @@ - LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}" - - if test "${cloog_org}" = yes ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5 --$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.18 of CLooG" >&5 -+$as_echo_n "checking for version 0.18 of CLooG... " >&6; } - if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -@@ -6061,8 +6061,7 @@ - main () - { - #if CLOOG_VERSION_MAJOR != 0 \ -- || CLOOG_VERSION_MINOR != 16 \ -- || CLOOG_VERSION_REVISION < 1 -+ || CLOOG_VERSION_MINOR != 18 - choke me - #endif - ; diff --git a/packages/toolchain/lang/gcc/patches/4.7.3/gcc-4.7.3-disable_multilib_i386_linux64.patch b/packages/toolchain/lang/gcc/patches/4.7.3/gcc-4.7.3-disable_multilib_i386_linux64.patch deleted file mode 100644 index 45b1a131b1..0000000000 --- a/packages/toolchain/lang/gcc/patches/4.7.3/gcc-4.7.3-disable_multilib_i386_linux64.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur gcc-4.7.3/gcc/config/i386/t-linux64 gcc-4.7.3.patch/gcc/config/i386/t-linux64 ---- gcc-4.7.3/gcc/config/i386/t-linux64 2013-01-14 17:32:37.000000000 +0100 -+++ gcc-4.7.3.patch/gcc/config/i386/t-linux64 2013-04-13 01:57:45.286907048 +0200 -@@ -34,6 +34,6 @@ - comma=, - MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) - MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) --MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu) --MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu) --MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) -+#MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu) -+#MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu) -+#MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) diff --git a/packages/toolchain/lang/gcc/patches/4.7.3/gcc-4.7.3-dynamic_linker.patch b/packages/toolchain/lang/gcc/patches/4.7.3/gcc-4.7.3-dynamic_linker.patch deleted file mode 100644 index 2166ed9b2b..0000000000 --- a/packages/toolchain/lang/gcc/patches/4.7.3/gcc-4.7.3-dynamic_linker.patch +++ /dev/null @@ -1,131 +0,0 @@ -diff -Naur gcc-4.7.0-old/gcc/config/i386/linux64.h gcc-4.7.0-new/gcc/config/i386/linux64.h ---- gcc-4.7.0-old/gcc/config/i386/linux64.h 2011-07-07 08:38:34.000000000 -0700 -+++ gcc-4.7.0-new/gcc/config/i386/linux64.h 2012-04-23 21:03:08.000000000 -0700 -@@ -29,5 +29,5 @@ - #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" - - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" --#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKERX32 "/lib/ld-linux-x32.so.2" -diff -Naur gcc-4.7.0-old/gcc/config/mips/iris6.h gcc-4.7.0-new/gcc/config/mips/iris6.h ---- gcc-4.7.0-old/gcc/config/mips/iris6.h 2012-03-05 02:43:22.000000000 -0800 -+++ gcc-4.7.0-new/gcc/config/mips/iris6.h 2012-04-23 21:02:07.000000000 -0700 -@@ -256,27 +256,27 @@ - #define STARTFILE_SPEC \ - "%{!shared: \ - %{mabi=n32: \ -- %{mips4:%{pg:/usr/lib32/mips4/gcrt1.o%s} \ -- %{!pg:%{p:/usr/lib32/mips4/mcrt1.o%s /usr/lib32/mips4/libprof1.a%s} \ -- %{!p:/usr/lib32/mips4/crt1.o%s}}} \ -- %{!mips4:%{pg:/usr/lib32/mips3/gcrt1.o%s} \ -- %{!pg:%{p:/usr/lib32/mips3/mcrt1.o%s /usr/lib32/mips3/libprof1.a%s} \ -- %{!p:/usr/lib32/mips3/crt1.o%s}}}} \ -+ %{mips4:%{pg:/usr/lib/mips4/gcrt1.o%s} \ -+ %{!pg:%{p:/usr/lib/mips4/mcrt1.o%s /usr/lib/mips4/libprof1.a%s} \ -+ %{!p:/usr/lib/mips4/crt1.o%s}}} \ -+ %{!mips4:%{pg:/usr/lib/mips3/gcrt1.o%s} \ -+ %{!pg:%{p:/usr/lib/mips3/mcrt1.o%s /usr/lib/mips3/libprof1.a%s} \ -+ %{!p:/usr/lib/mips3/crt1.o%s}}}} \ - %{mabi=64: \ -- %{mips4:%{pg:/usr/lib64/mips4/gcrt1.o} \ -- %{!pg:%{p:/usr/lib64/mips4/mcrt1.o /usr/lib64/mips4/libprof1.a} \ -- %{!p:/usr/lib64/mips4/crt1.o}}} \ -- %{!mips4:%{pg:/usr/lib64/mips3/gcrt1.o} \ -- %{!pg:%{p:/usr/lib64/mips3/mcrt1.o /usr/lib64/mips3/libprof1.a} \ -- %{!p:/usr/lib64/mips3/crt1.o}}}}} \ -+ %{mips4:%{pg:/usr/lib/mips4/gcrt1.o} \ -+ %{!pg:%{p:/usr/lib/mips4/mcrt1.o /usr/lib/mips4/libprof1.a} \ -+ %{!p:/usr/lib/mips4/crt1.o}}} \ -+ %{!mips4:%{pg:/usr/lib/mips3/gcrt1.o} \ -+ %{!pg:%{p:/usr/lib/mips3/mcrt1.o /usr/lib/mips3/libprof1.a} \ -+ %{!p:/usr/lib/mips3/crt1.o}}}}} \ - irix-crti.o%s crtbegin.o%s" - - #undef LIB_SPEC - #define LIB_SPEC \ -- "%{mabi=n32: %{mips4:-L/usr/lib32/mips4} %{!mips4:-L/usr/lib32/mips3} \ -- -L/usr/lib32} \ -- %{mabi=64: %{mips4:-L/usr/lib64/mips4} %{!mips4:-L/usr/lib64/mips3} \ -- -L/usr/lib64} \ -+ "%{mabi=n32: %{mips4:-L/usr/lib/mips4} %{!mips4:-L/usr/lib/mips3} \ -+ -L/usr/lib} \ -+ %{mabi=64: %{mips4:-L/usr/lib/mips4} %{!mips4:-L/usr/lib/mips3} \ -+ -L/usr/lib} \ - %{!shared:" \ - SUBTARGET_DONT_WARN_UNUSED_SPEC \ - " %{pthread:-lpthread} %{p:libprof1.a%s}%{pg:libprof1.a%s} -lc " \ -@@ -293,10 +293,10 @@ - "%{Ofast|ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \ - crtend.o%s irix-crtn.o%s \ - %{!shared: \ -- %{mabi=n32:%{mips4:/usr/lib32/mips4/crtn.o%s}\ -- %{!mips4:/usr/lib32/mips3/crtn.o%s}}\ -- %{mabi=64:%{mips4:/usr/lib64/mips4/crtn.o%s}\ -- %{!mips4:/usr/lib64/mips3/crtn.o%s}}}" -+ %{mabi=n32:%{mips4:/usr/lib/mips4/crtn.o%s}\ -+ %{!mips4:/usr/lib/mips3/crtn.o%s}}\ -+ %{mabi=64:%{mips4:/usr/lib/mips4/crtn.o%s}\ -+ %{!mips4:/usr/lib/mips3/crtn.o%s}}}" - - /* Generic part of the LINK_SPEC. */ - #undef LINK_SPEC -diff -Naur gcc-4.7.0-old/gcc/config/mips/linux64.h gcc-4.7.0-new/gcc/config/mips/linux64.h ---- gcc-4.7.0-old/gcc/config/mips/linux64.h 2011-07-19 11:00:27.000000000 -0700 -+++ gcc-4.7.0-new/gcc/config/mips/linux64.h 2012-04-23 21:02:07.000000000 -0700 -@@ -24,9 +24,9 @@ - #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32" - - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" --#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" --#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1" -+#define GLIBC_DYNAMIC_LINKERN32 "/lib/ld.so.1" -+#define UCLIBC_DYNAMIC_LINKERN32 "/lib/ld-uClibc.so.0" - #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" - #define GNU_USER_DYNAMIC_LINKERN32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ -diff -Naur gcc-4.7.0-old/gcc/config/rs6000/linux64.h gcc-4.7.0-new/gcc/config/rs6000/linux64.h ---- gcc-4.7.0-old/gcc/config/rs6000/linux64.h 2012-03-12 09:16:51.000000000 -0700 -+++ gcc-4.7.0-new/gcc/config/rs6000/linux64.h 2012-04-23 21:02:07.000000000 -0700 -@@ -359,7 +359,7 @@ - #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" - - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" - #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" - #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" - #if DEFAULT_LIBC == LIBC_UCLIBC -diff -Naur gcc-4.7.0-old/gcc/config/sparc/linux64.h gcc-4.7.0-new/gcc/config/sparc/linux64.h ---- gcc-4.7.0-old/gcc/config/sparc/linux64.h 2011-11-11 17:05:07.000000000 -0800 -+++ gcc-4.7.0-new/gcc/config/sparc/linux64.h 2012-04-23 21:02:07.000000000 -0700 -@@ -94,7 +94,7 @@ - done. */ - - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2" - - #ifdef SPARC_BI_ARCH - -@@ -113,7 +113,7 @@ - %{static:-static}} \ - " - --#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -202,7 +202,7 @@ - #else /* !SPARC_BI_ARCH */ - - #undef LINK_SPEC --#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ diff --git a/packages/toolchain/lang/gcc/patches/4.7.3/gcc-4.7.3-libstdc++-v3_config.patch b/packages/toolchain/lang/gcc/patches/4.7.3/gcc-4.7.3-libstdc++-v3_config.patch deleted file mode 100644 index 12a99c3e30..0000000000 --- a/packages/toolchain/lang/gcc/patches/4.7.3/gcc-4.7.3-libstdc++-v3_config.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff -Naur gcc-4.7.0-old/libstdc++-v3/config.h.in gcc-4.7.0-new/libstdc++-v3/config.h.in ---- gcc-4.7.0-old/libstdc++-v3/config.h.in 2012-03-22 08:25:54.000000000 -0700 -+++ gcc-4.7.0-new/libstdc++-v3/config.h.in 2012-03-22 08:28:32.000000000 -0700 -@@ -130,7 +130,7 @@ - #undef HAVE_FABSL - - /* Define to 1 if you have the header file. */ --#undef HAVE_FENV_H -+#define HAVE_FENV_H 1 - - /* Define to 1 if you have the `finite' function. */ - #undef HAVE_FINITE -@@ -184,7 +184,7 @@ - #undef HAVE_HYPOTL - - /* Define if you have the iconv() function. */ --#undef HAVE_ICONV -+#define HAVE_ICONV 1 - - /* Define to 1 if you have the header file. */ - #undef HAVE_IEEEFP_H -@@ -223,7 +223,7 @@ - #undef HAVE_ISWBLANK - - /* Define if LC_MESSAGES is available in . */ --#undef HAVE_LC_MESSAGES -+#define HAVE_LC_MESSAGES 1 - - /* Define to 1 if you have the `ldexpf' function. */ - #undef HAVE_LDEXPF -@@ -304,7 +304,7 @@ - #undef HAVE_QFPCLASS - - /* Define to 1 if you have the `setenv' function. */ --#undef HAVE_SETENV -+#define HAVE_SETENV 1 - - /* Define to 1 if you have the `sincos' function. */ - #undef HAVE_SINCOS -@@ -346,7 +346,7 @@ - #undef HAVE_STDLIB_H - - /* Define if strerror_l is available in . */ --#undef HAVE_STRERROR_L -+#define HAVE_STRERROR_L 1 - - /* Define if strerror_r is available in . */ - #undef HAVE_STRERROR_R -@@ -377,7 +377,7 @@ - #undef HAVE_SYS_IOCTL_H - - /* Define to 1 if you have the header file. */ --#undef HAVE_SYS_IPC_H -+#define HAVE_SYS_IPC_H 1 - - /* Define to 1 if you have the header file. */ - #undef HAVE_SYS_ISA_DEFS_H -@@ -389,10 +389,10 @@ - #undef HAVE_SYS_PARAM_H - - /* Define to 1 if you have the header file. */ --#undef HAVE_SYS_RESOURCE_H -+#define HAVE_SYS_RESOURCE_H 1 - - /* Define to 1 if you have the header file. */ --#undef HAVE_SYS_SEM_H -+#define HAVE_SYS_SEM_H 1 - - /* Define to 1 if you have the header file. */ - #undef HAVE_SYS_STAT_H -@@ -401,7 +401,7 @@ - #undef HAVE_SYS_SYSINFO_H - - /* Define to 1 if you have the header file. */ --#undef HAVE_SYS_TIME_H -+#define HAVE_SYS_TIME_H 1 - - /* Define to 1 if you have the header file. */ - #undef HAVE_SYS_TYPES_H -@@ -431,7 +431,7 @@ - #undef HAVE_TGMATH_H - - /* Define to 1 if the target supports thread-local storage. */ --#undef HAVE_TLS -+#define HAVE_TLS 1 - - /* Define to 1 if you have the header file. */ - #undef HAVE_UNISTD_H -@@ -644,7 +644,7 @@ - #undef HAVE__TANL - - /* Define as const if the declaration of iconv() needs const. */ --#undef ICONV_CONST -+#define ICONV_CONST 1 - - /* Define to the sub-directory in which libtool stores uninstalled libraries. - */ diff --git a/packages/toolchain/lang/gcc/patches/4.8.0/gcc-cloog-0.18.patch b/packages/toolchain/lang/gcc/patches/gcc-cloog-0.18.patch similarity index 100% rename from packages/toolchain/lang/gcc/patches/4.8.0/gcc-cloog-0.18.patch rename to packages/toolchain/lang/gcc/patches/gcc-cloog-0.18.patch diff --git a/packages/toolchain/lang/gcc/patches/4.8.0/gcc-disable_multilib_i386_linux64.patch b/packages/toolchain/lang/gcc/patches/gcc-disable_multilib_i386_linux64.patch similarity index 100% rename from packages/toolchain/lang/gcc/patches/4.8.0/gcc-disable_multilib_i386_linux64.patch rename to packages/toolchain/lang/gcc/patches/gcc-disable_multilib_i386_linux64.patch diff --git a/packages/toolchain/lang/gcc/patches/4.8.0/gcc-dynamic_linker.patch b/packages/toolchain/lang/gcc/patches/gcc-dynamic_linker.patch similarity index 100% rename from packages/toolchain/lang/gcc/patches/4.8.0/gcc-dynamic_linker.patch rename to packages/toolchain/lang/gcc/patches/gcc-dynamic_linker.patch diff --git a/packages/toolchain/lang/gcc/patches/4.8.0/gcc-libstdc++-v3_config.patch b/packages/toolchain/lang/gcc/patches/gcc-libstdc++-v3_config.patch similarity index 100% rename from packages/toolchain/lang/gcc/patches/4.8.0/gcc-libstdc++-v3_config.patch rename to packages/toolchain/lang/gcc/patches/gcc-libstdc++-v3_config.patch diff --git a/projects/ARCTIC_MC/options b/projects/ARCTIC_MC/options index 39353d6840..16d4e46e90 100755 --- a/projects/ARCTIC_MC/options +++ b/projects/ARCTIC_MC/options @@ -100,10 +100,6 @@ # Target Configfile for u-boot UBOOT_CONFIGFILE="" -# GCC to use. values can be: -# default: default mainline gcc - GCC_VERSION="default" - # install Berryboot support tools BERRYBOOT_TOOLS="no" diff --git a/projects/ATV/options b/projects/ATV/options index c50f8c0cdc..32d0a3ee6d 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -92,6 +92,7 @@ GOLD_SUPPORT="yes" # Bootloader to use (syslinux / u-boot / atv-bootloader) +# BOOTLOADER="atv-bootloader" disabled for now BOOTLOADER="atv-bootloader" # Configuration for u-boot @@ -100,10 +101,6 @@ # Target Configfile for u-boot UBOOT_CONFIGFILE="" -# GCC to use. values can be: -# default: default mainline gcc - GCC_VERSION="default" - # install Berryboot support tools BERRYBOOT_TOOLS="no" diff --git a/projects/Fusion/options b/projects/Fusion/options index be7956b3ae..a199f4c431 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -100,10 +100,6 @@ # Target Configfile for u-boot UBOOT_CONFIGFILE="" -# GCC to use. values can be: -# default: default mainline gcc - GCC_VERSION="default" - # install Berryboot support tools BERRYBOOT_TOOLS="no" diff --git a/projects/Generic/options b/projects/Generic/options index 2a88cc1045..47a72e16a3 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -100,10 +100,6 @@ # Target Configfile for u-boot UBOOT_CONFIGFILE="" -# GCC to use. values can be: -# default: default mainline gcc - GCC_VERSION="default" - # install Berryboot support tools BERRYBOOT_TOOLS="no" diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index b038ba7386..96602a8f18 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -100,10 +100,6 @@ # Target Configfile for u-boot UBOOT_CONFIGFILE="" -# GCC to use. values can be: -# default: default mainline gcc - GCC_VERSION="default" - # install Berryboot support tools BERRYBOOT_TOOLS="no" diff --git a/projects/ION/options b/projects/ION/options index b303dcbb1f..1bf1b1cbdf 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -100,10 +100,6 @@ # Target Configfile for u-boot UBOOT_CONFIGFILE="" -# GCC to use. values can be: -# default: default mainline gcc - GCC_VERSION="default" - # install Berryboot support tools BERRYBOOT_TOOLS="no" diff --git a/projects/Intel/options b/projects/Intel/options index 38ea656191..2a5f2594fb 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -100,10 +100,6 @@ # Target Configfile for u-boot UBOOT_CONFIGFILE="" -# GCC to use. values can be: -# default: default mainline gcc - GCC_VERSION="default" - # install Berryboot support tools BERRYBOOT_TOOLS="no" diff --git a/projects/RPi/options b/projects/RPi/options index f7f7e935ba..14e015b777 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -89,7 +89,7 @@ LTO_SUPPORT="yes" # GOLD (Google Linker) support - GOLD_SUPPORT="no" + GOLD_SUPPORT="yes" # Bootloader to use (syslinux / u-boot / atv-bootloader / bcm2835-bootloader) BOOTLOADER="bcm2835-bootloader" @@ -100,10 +100,6 @@ # Target Configfile for u-boot UBOOT_CONFIGFILE="" -# GCC to use. values can be: -# default: default mainline gcc - GCC_VERSION="4.7" - # install Berryboot support tools BERRYBOOT_TOOLS="yes" diff --git a/projects/Ultra/options b/projects/Ultra/options index 240fbf1ffa..674fea0199 100755 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -100,10 +100,6 @@ # Target Configfile for u-boot UBOOT_CONFIGFILE="" -# GCC to use. values can be: -# default: default mainline gcc - GCC_VERSION="default" - # install Berryboot support tools BERRYBOOT_TOOLS="no" diff --git a/projects/Virtual/options b/projects/Virtual/options index aea2568011..1ba287436e 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -95,10 +95,6 @@ # Target Configfile for u-boot UBOOT_CONFIGFILE="" -# GCC to use. values can be: -# default: default mainline gcc - GCC_VERSION="default" - # install Berryboot support tools BERRYBOOT_TOOLS="no"