summaryrefslogtreecommitdiff
path: root/package/gcc
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2012-03-24 11:07:28 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2012-03-24 11:07:28 (GMT)
commitac46e350e174e78a55a348eda775665ae0eb3277 (patch)
tree5574ba5e9a7108554683edb25bcd4b99599b8fa7 /package/gcc
parent89aa2adc650176b493075e1d8e64f1b6cc635d90 (diff)
update gcc, glibc and fix build breakage
Diffstat (limited to 'package/gcc')
-rw-r--r--package/gcc/patches/cflags.patch128
-rw-r--r--package/gcc/patches/no-lib64.patch62
2 files changed, 95 insertions, 95 deletions
diff --git a/package/gcc/patches/cflags.patch b/package/gcc/patches/cflags.patch
index 0d5815a..3623d38 100644
--- a/package/gcc/patches/cflags.patch
+++ b/package/gcc/patches/cflags.patch
@@ -17,20 +17,20 @@
This patch was authored by Thorsten Glaser <tg at mirbsd.de>
with copyright assignment to the FSF in effect.
---- a/gcc/c-opts.c
-+++ b/gcc/c-opts.c
-@@ -105,6 +105,9 @@
+--- a/gcc/c-family/c-opts.c
++++ b/gcc/c-family/c-opts.c
+@@ -103,6 +103,9 @@ static size_t deferred_count;
/* 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);
-@@ -454,6 +457,9 @@
- enable_warning_as_error ("implicit-function-declaration", value, CL_C | CL_ObjC);
+ static void set_std_cxx0x (int);
+@@ -441,6 +444,9 @@ c_common_handle_option (size_t scode, co
+ global_dc->warning_as_error_requested = value;
break;
+ case OPT_Werror_maybe_reset:
@@ -39,20 +39,20 @@
case OPT_Wformat:
set_Wformat (value);
break;
-@@ -690,6 +701,12 @@
- flag_exceptions = value;
+@@ -584,6 +590,12 @@ c_common_handle_option (size_t scode, co
+ flag_no_builtin = !value;
break;
+ case OPT_fhonour_copts:
+ if (c_language == clk_c) {
-+ honour_copts++;
++ honour_copts++;
+ }
+ break;
+
- case OPT_fimplement_inlines:
- flag_implement_inlines = value;
+ case OPT_fconstant_string_class_:
+ constant_string_class_name = arg;
break;
-@@ -1209,6 +1226,47 @@
+@@ -1058,6 +1070,47 @@ c_common_init (void)
return false;
}
@@ -75,35 +75,35 @@
+ }
+ if (evv == 1) {
+ if (honour_copts == 0) {
-+ error ("someone does not honour COPTS at all in lenient mode");
-+ return false;
++ 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);
++ 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;
++ 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;
++ error ("someone does not honour COPTS correctly, passed %d times",
++ honour_copts);
++ return false;
+ }
+ } else if (evv == 0) {
+ if (honour_copts != 1)
-+ inform (0, "someone does not honour COPTS correctly, passed %d times",
-+ honour_copts);
++ inform (0, "someone does not honour COPTS correctly, passed %d times",
++ honour_copts);
+ }
+ }
+
return true;
}
---- a/gcc/c.opt
-+++ b/gcc/c.opt
-@@ -215,6 +215,10 @@
- C ObjC RejectNegative Warning
+--- a/gcc/c-family/c.opt
++++ b/gcc/c-family/c.opt
+@@ -363,6 +363,10 @@ Werror-implicit-function-declaration
+ C ObjC RejectNegative Warning Alias(Werror=, implicit-function-declaration)
This switch is deprecated; use -Werror=implicit-function-declaration instead
+Werror-maybe-reset
@@ -113,9 +113,9 @@
Wfloat-equal
C ObjC C++ ObjC++ Var(warn_float_equal) Warning
Warn if testing floating point numbers for equality
-@@ -609,6 +613,9 @@
+@@ -794,6 +798,9 @@ C++ ObjC++ Optimization Alias(fexception
fhonor-std
- C++ ObjC++
+ C++ ObjC++ Ignore Warn(switch %qs is no longer supported)
+fhonour-copts
+C ObjC C++ ObjC++ RejectNegative
@@ -125,7 +125,7 @@
Assume normal C execution environment
--- a/gcc/common.opt
+++ b/gcc/common.opt
-@@ -102,6 +102,10 @@
+@@ -520,6 +520,10 @@ Werror=
Common Joined
Treat specified warning as error
@@ -134,9 +134,9 @@
+If environment variable GCC_NO_WERROR is set, act as -Wno-error
+
Wextra
- Common Warning
+ Common Var(extra_warnings) Warning
Print extra (possibly unwanted) warnings
-@@ -573,6 +577,9 @@
+@@ -1156,6 +1160,9 @@ fguess-branch-probability
Common Report Var(flag_guess_branch_prob) Optimization
Enable guessing of branch probabilities
@@ -148,33 +148,33 @@
; On SVR4 targets, it also controls whether or not to emit a
--- a/gcc/opts.c
+++ b/gcc/opts.c
-@@ -896,8 +896,6 @@
- flag_schedule_insns_after_reload = opt2;
+@@ -477,8 +477,6 @@ static const struct default_options defa
+ { OPT_LEVELS_2_PLUS, OPT_fschedule_insns2, NULL, 1 },
#endif
- flag_regmove = opt2;
-- flag_strict_aliasing = opt2;
-- flag_strict_overflow = opt2;
- flag_reorder_blocks = opt2;
- flag_reorder_functions = opt2;
- flag_tree_vrp = opt2;
-@@ -922,6 +919,8 @@
+ { OPT_LEVELS_2_PLUS, OPT_fregmove, NULL, 1 },
+- { OPT_LEVELS_2_PLUS, OPT_fstrict_aliasing, NULL, 1 },
+- { OPT_LEVELS_2_PLUS, OPT_fstrict_overflow, NULL, 1 },
+ { OPT_LEVELS_2_PLUS, OPT_freorder_blocks, NULL, 1 },
+ { OPT_LEVELS_2_PLUS, OPT_freorder_functions, NULL, 1 },
+ { OPT_LEVELS_2_PLUS, OPT_ftree_vrp, NULL, 1 },
+@@ -494,6 +492,8 @@ static const struct default_options defa
+ { OPT_LEVELS_2_PLUS, OPT_falign_functions, NULL, 1 },
- /* -O3 optimizations. */
- opt3 = (optimize >= 3);
-+ flag_strict_aliasing = opt3;
-+ flag_strict_overflow = opt3;
- flag_predictive_commoning = opt3;
- flag_inline_functions = opt3;
- flag_unswitch_loops = opt3;
-@@ -1601,6 +1601,17 @@
- enable_warning_as_error (arg, value, lang_mask);
+ /* -O3 optimizations. */
++ { OPT_LEVELS_3_PLUS, OPT_fstrict_aliasing, NULL, 1 },
++ { OPT_LEVELS_3_PLUS, OPT_fstrict_overflow, NULL, 1 },
+ { OPT_LEVELS_3_PLUS, OPT_ftree_loop_distribute_patterns, NULL, 1 },
+ { OPT_LEVELS_3_PLUS, OPT_fpredictive_commoning, NULL, 1 },
+ /* Inlining of functions reducing size is a good idea with -Os
+@@ -1399,6 +1399,17 @@ common_handle_option (struct gcc_options
+ opts, opts_set, loc, dc);
break;
+ case OPT_Werror_maybe_reset:
+ {
-+ char *ev = getenv ("GCC_NO_WERROR");
-+ if ((ev != NULL) && (*ev != '0'))
-+ warnings_are_errors = 0;
++ char *ev = getenv ("GCC_NO_WERROR");
++ if ((ev != NULL) && (*ev != '0'))
++ warnings_are_errors = 0;
+ }
+ break;
+
@@ -182,11 +182,11 @@
+ break;
+
case OPT_Wlarger_than_:
- /* This form corresponds to -Wlarger-than-.
- Kept for backward compatibility.
+ opts->x_larger_than_size = value;
+ opts->x_warn_larger_than = value != -1;
--- a/gcc/doc/cppopts.texi
+++ b/gcc/doc/cppopts.texi
-@@ -164,6 +164,11 @@
+@@ -164,6 +164,11 @@ in older programs. This warning is on b
Make all warnings into hard errors. Source code which triggers warnings
will be rejected.
@@ -200,16 +200,16 @@
Issue warnings for code in system headers. These are normally unhelpful
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
-@@ -234,7 +234,7 @@
- -Wconversion -Wcoverage-mismatch -Wno-deprecated @gol
+@@ -240,7 +240,7 @@ Objective-C and Objective-C++ Dialects}.
+ -Wconversion -Wcoverage-mismatch -Wno-cpp -Wno-deprecated @gol
-Wno-deprecated-declarations -Wdisabled-optimization @gol
- -Wno-div-by-zero -Wempty-body -Wenum-compare -Wno-endif-labels @gol
---Werror -Werror=* @gol
-+-Werror -Werror=* -Werror-maybe-reset @gol
+ -Wno-div-by-zero -Wdouble-promotion -Wempty-body -Wenum-compare @gol
+--Wno-endif-labels -Werror -Werror=* @gol
++-Wno-endif-labels -Werror -Werror=* -Werror-maybe-reset @gol
-Wfatal-errors -Wfloat-equal -Wformat -Wformat=2 @gol
-Wno-format-contains-nul -Wno-format-extra-args -Wformat-nonliteral @gol
-Wformat-security -Wformat-y2k @gol
-@@ -4161,6 +4161,22 @@
+@@ -4497,6 +4497,22 @@ This option is only supported for C and
@option{-Wall} and by @option{-pedantic}, which can be disabled with
@option{-Wno-pointer-sign}.
@@ -232,7 +232,7 @@
@item -Wstack-protector
@opindex Wstack-protector
@opindex Wno-stack-protector
-@@ -5699,7 +5715,7 @@
+@@ -6319,7 +6335,7 @@ so, the first branch is redirected to ei
second branch or a point immediately following it, depending on whether
the condition is known to be true or false.
@@ -243,7 +243,7 @@
@opindex fsplit-wide-types
--- a/gcc/java/jvspec.c
+++ b/gcc/java/jvspec.c
-@@ -670,6 +670,7 @@
+@@ -627,6 +627,7 @@ lang_specific_pre_link (void)
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));
diff --git a/package/gcc/patches/no-lib64.patch b/package/gcc/patches/no-lib64.patch
index 5c6e0b0..8722018 100644
--- a/package/gcc/patches/no-lib64.patch
+++ b/package/gcc/patches/no-lib64.patch
@@ -1,7 +1,7 @@
-diff -Nur gcc-4.5.3.orig/gcc/config/i386/linux64.h gcc-4.5.3/gcc/config/i386/linux64.h
---- gcc-4.5.3.orig/gcc/config/i386/linux64.h 2010-03-24 21:44:48.000000000 +0100
-+++ gcc-4.5.3/gcc/config/i386/linux64.h 2011-08-24 06:35:30.000000000 +0200
-@@ -59,7 +59,7 @@
+diff -Nur gcc-4.6.3.orig/gcc/config/i386/linux64.h gcc-4.6.3/gcc/config/i386/linux64.h
+--- gcc-4.6.3.orig/gcc/config/i386/linux64.h 2011-09-08 11:12:35.000000000 +0200
++++ gcc-4.6.3/gcc/config/i386/linux64.h 2012-03-21 13:30:49.125903065 +0100
+@@ -63,7 +63,7 @@
done. */
#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
@@ -10,9 +10,9 @@ diff -Nur gcc-4.5.3.orig/gcc/config/i386/linux64.h gcc-4.5.3/gcc/config/i386/lin
#if TARGET_64BIT_DEFAULT
#define SPEC_32 "m32"
-diff -Nur gcc-4.5.3.orig/gcc/config/i386/t-linux64 gcc-4.5.3/gcc/config/i386/t-linux64
---- gcc-4.5.3.orig/gcc/config/i386/t-linux64 2009-04-21 21:03:23.000000000 +0200
-+++ gcc-4.5.3/gcc/config/i386/t-linux64 2011-08-24 06:35:30.000000000 +0200
+diff -Nur gcc-4.6.3.orig/gcc/config/i386/t-linux64 gcc-4.6.3/gcc/config/i386/t-linux64
+--- gcc-4.6.3.orig/gcc/config/i386/t-linux64 2009-04-21 21:03:23.000000000 +0200
++++ gcc-4.6.3/gcc/config/i386/t-linux64 2012-03-21 13:30:49.125903065 +0100
@@ -25,7 +25,7 @@
MULTILIB_OPTIONS = m64/m32
@@ -22,9 +22,9 @@ diff -Nur gcc-4.5.3.orig/gcc/config/i386/t-linux64 gcc-4.5.3/gcc/config/i386/t-l
LIBGCC = stmp-multilib
INSTALL_LIBGCC = install-multilib
-diff -Nur gcc-4.5.3.orig/gcc/config/mips/linux64.h gcc-4.5.3/gcc/config/mips/linux64.h
---- gcc-4.5.3.orig/gcc/config/mips/linux64.h 2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.5.3/gcc/config/mips/linux64.h 2011-08-24 06:35:30.000000000 +0200
+diff -Nur gcc-4.6.3.orig/gcc/config/mips/linux64.h gcc-4.6.3/gcc/config/mips/linux64.h
+--- gcc-4.6.3.orig/gcc/config/mips/linux64.h 2011-01-19 21:39:09.000000000 +0100
++++ gcc-4.6.3/gcc/config/mips/linux64.h 2012-03-21 13:31:26.549903066 +0100
@@ -36,9 +36,9 @@
%{profile:-lc_p} %{!profile:-lc}}"
@@ -35,12 +35,12 @@ diff -Nur gcc-4.5.3.orig/gcc/config/mips/linux64.h gcc-4.5.3/gcc/config/mips/lin
+#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 LINUX_DYNAMIC_LINKERN32 \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
-
-diff -Nur gcc-4.5.3.orig/gcc/config/mips/t-linux64 gcc-4.5.3/gcc/config/mips/t-linux64
---- gcc-4.5.3.orig/gcc/config/mips/t-linux64 2009-04-21 21:03:23.000000000 +0200
-+++ gcc-4.5.3/gcc/config/mips/t-linux64 2011-08-24 06:35:30.000000000 +0200
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
+diff -Nur gcc-4.6.3.orig/gcc/config/mips/t-linux64 gcc-4.6.3/gcc/config/mips/t-linux64
+--- gcc-4.6.3.orig/gcc/config/mips/t-linux64 2009-04-21 21:03:23.000000000 +0200
++++ gcc-4.6.3/gcc/config/mips/t-linux64 2012-03-21 13:30:51.685903041 +0100
@@ -18,7 +18,7 @@
MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
@@ -50,10 +50,10 @@ diff -Nur gcc-4.5.3.orig/gcc/config/mips/t-linux64 gcc-4.5.3/gcc/config/mips/t-l
EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
-diff -Nur gcc-4.5.3.orig/gcc/config/rs6000/linux64.h gcc-4.5.3/gcc/config/rs6000/linux64.h
---- gcc-4.5.3.orig/gcc/config/rs6000/linux64.h 2010-11-17 07:09:53.000000000 +0100
-+++ gcc-4.5.3/gcc/config/rs6000/linux64.h 2011-08-24 06:35:30.000000000 +0200
-@@ -341,7 +341,7 @@
+diff -Nur gcc-4.6.3.orig/gcc/config/rs6000/linux64.h gcc-4.6.3/gcc/config/rs6000/linux64.h
+--- gcc-4.6.3.orig/gcc/config/rs6000/linux64.h 2011-03-07 08:50:23.000000000 +0100
++++ gcc-4.6.3/gcc/config/rs6000/linux64.h 2012-03-21 13:30:51.685903041 +0100
+@@ -373,7 +373,7 @@
#define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
@@ -61,10 +61,10 @@ diff -Nur gcc-4.5.3.orig/gcc/config/rs6000/linux64.h gcc-4.5.3/gcc/config/rs6000
+#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 UCLIBC_DEFAULT
-diff -Nur gcc-4.5.3.orig/gcc/config/rs6000/t-linux64 gcc-4.5.3/gcc/config/rs6000/t-linux64
---- gcc-4.5.3.orig/gcc/config/rs6000/t-linux64 2009-04-21 21:03:23.000000000 +0200
-+++ gcc-4.5.3/gcc/config/rs6000/t-linux64 2011-08-24 06:35:30.000000000 +0200
+ #if DEFAULT_LIBC == LIBC_UCLIBC
+diff -Nur gcc-4.6.3.orig/gcc/config/rs6000/t-linux64 gcc-4.6.3/gcc/config/rs6000/t-linux64
+--- gcc-4.6.3.orig/gcc/config/rs6000/t-linux64 2009-04-21 21:03:23.000000000 +0200
++++ gcc-4.6.3/gcc/config/rs6000/t-linux64 2012-03-21 13:30:51.685903041 +0100
@@ -36,7 +36,7 @@
MULTILIB_EXTRA_OPTS = fPIC mstrict-align
MULTILIB_EXCEPTIONS = m64/msoft-float
@@ -74,11 +74,11 @@ diff -Nur gcc-4.5.3.orig/gcc/config/rs6000/t-linux64 gcc-4.5.3/gcc/config/rs6000
MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT)
softfp_wrap_start := '\#ifndef __powerpc64__'
-diff -Nur gcc-4.5.3.orig/gcc/config/sparc/linux64.h gcc-4.5.3/gcc/config/sparc/linux64.h
---- gcc-4.5.3.orig/gcc/config/sparc/linux64.h 2010-09-22 23:15:37.000000000 +0200
-+++ gcc-4.5.3/gcc/config/sparc/linux64.h 2011-08-24 06:36:52.000000000 +0200
-@@ -110,7 +110,7 @@
- /* If ELF is the default format, we should not use /lib/elf. */
+diff -Nur gcc-4.6.3.orig/gcc/config/sparc/linux64.h gcc-4.6.3/gcc/config/sparc/linux64.h
+--- gcc-4.6.3.orig/gcc/config/sparc/linux64.h 2011-09-08 11:12:35.000000000 +0200
++++ gcc-4.6.3/gcc/config/sparc/linux64.h 2012-03-21 13:30:51.685903041 +0100
+@@ -102,7 +102,7 @@
+ done. */
#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
@@ -86,9 +86,9 @@ diff -Nur gcc-4.5.3.orig/gcc/config/sparc/linux64.h gcc-4.5.3/gcc/config/sparc/l
#ifdef SPARC_BI_ARCH
-diff -Nur gcc-4.5.3.orig/gcc/config/sparc/t-linux64 gcc-4.5.3/gcc/config/sparc/t-linux64
---- gcc-4.5.3.orig/gcc/config/sparc/t-linux64 2010-10-04 18:54:26.000000000 +0200
-+++ gcc-4.5.3/gcc/config/sparc/t-linux64 2011-08-24 06:37:15.000000000 +0200
+diff -Nur gcc-4.6.3.orig/gcc/config/sparc/t-linux64 gcc-4.6.3/gcc/config/sparc/t-linux64
+--- gcc-4.6.3.orig/gcc/config/sparc/t-linux64 2011-05-22 22:03:43.000000000 +0200
++++ gcc-4.6.3/gcc/config/sparc/t-linux64 2012-03-21 13:30:51.685903041 +0100
@@ -26,7 +26,7 @@
MULTILIB_OPTIONS = m64/m32