diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2013-12-12 11:09:44 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2013-12-12 11:09:44 +0000 |
| commit | 54167372ebb96aa5d32aa2a86a321a8e335b8006 (patch) | |
| tree | 7843557d4511c74cdb3154e722c34ce961bf6266 | |
| parent | 7a19874b8cc4a394ca1bb47537429c2f477c4ad2 (diff) | |
| download | gcc-48-54167372ebb96aa5d32aa2a86a321a8e335b8006.tar.gz | |
- Refresh patches
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.8@7060 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
26 files changed, 274 insertions, 172 deletions
diff --git a/debian/patches/alpha-no-ev4-directive.diff b/debian/patches/alpha-no-ev4-directive.diff index 77e1ba1..902f335 100644 --- a/debian/patches/alpha-no-ev4-directive.diff +++ b/debian/patches/alpha-no-ev4-directive.diff @@ -8,7 +8,7 @@ Index: b/src/gcc/config/alpha/alpha.c =================================================================== --- a/src/gcc/config/alpha/alpha.c +++ b/src/gcc/config/alpha/alpha.c -@@ -9365,7 +9365,7 @@ +@@ -9363,7 +9363,7 @@ fputs ("\t.set nomacro\n", asm_out_file); if (TARGET_SUPPORT_ARCH | TARGET_BWX | TARGET_MAX | TARGET_FIX | TARGET_CIX) { @@ -17,7 +17,7 @@ Index: b/src/gcc/config/alpha/alpha.c if (alpha_cpu == PROCESSOR_EV6 || TARGET_FIX || TARGET_CIX) arch = "ev6"; -@@ -9375,10 +9375,9 @@ +@@ -9373,10 +9373,9 @@ arch = "ev56"; else if (alpha_cpu == PROCESSOR_EV5) arch = "ev5"; diff --git a/debian/patches/arm-multilib-defaults.diff b/debian/patches/arm-multilib-defaults.diff index 696a626..d0f2933 100644 --- a/debian/patches/arm-multilib-defaults.diff +++ b/debian/patches/arm-multilib-defaults.diff @@ -4,7 +4,7 @@ Index: b/src/gcc/config.gcc =================================================================== --- a/src/gcc/config.gcc +++ b/src/gcc/config.gcc -@@ -3229,10 +3229,18 @@ +@@ -3249,10 +3249,18 @@ esac case "$with_float" in @@ -25,7 +25,7 @@ Index: b/src/gcc/config.gcc *) echo "Unknown floating point type used in --with-float=$with_float" 1>&2 exit 1 -@@ -3269,6 +3277,9 @@ +@@ -3289,6 +3297,9 @@ "" \ | arm | thumb ) #OK @@ -39,7 +39,7 @@ Index: b/src/gcc/config/arm/linux-eabi.h =================================================================== --- a/src/gcc/config/arm/linux-eabi.h +++ b/src/gcc/config/arm/linux-eabi.h -@@ -34,7 +34,21 @@ +@@ -43,7 +43,21 @@ target hardware. If you override this to use the hard-float ABI then change the setting of GLIBC_DYNAMIC_LINKER_DEFAULT as well. */ #undef TARGET_DEFAULT_FLOAT_ABI @@ -61,7 +61,7 @@ Index: b/src/gcc/config/arm/linux-eabi.h /* We default to the "aapcs-linux" ABI so that enums are int-sized by default. */ -@@ -77,6 +91,28 @@ +@@ -86,6 +100,28 @@ %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \ %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}" diff --git a/debian/patches/arm-sanitizer.diff b/debian/patches/arm-sanitizer.diff index 1fce44b..8dd918c 100644 --- a/debian/patches/arm-sanitizer.diff +++ b/debian/patches/arm-sanitizer.diff @@ -42,8 +42,10 @@ gcc/testsuite/ * g++.dg/asan/deep-thread-stack-1.C: Likewise. * g++.dg/asan/large-func-test-1.C: Likewise. ---- a/src/libsanitizer/configure.tgt (revision 200266) -+++ b/src/libsanitizer/configure.tgt (revision 200267) +Index: b/src/libsanitizer/configure.tgt +=================================================================== +--- a/src/libsanitizer/configure.tgt ++++ b/src/libsanitizer/configure.tgt @@ -29,6 +29,8 @@ ;; sparc*-*-linux*) @@ -53,9 +55,11 @@ gcc/testsuite/ x86_64-*-darwin[1]* | i?86-*-darwin[1]*) TSAN_SUPPORTED=no ;; ---- a/src/gcc/testsuite/lib/target-supports.exp (revision 200266) -+++ b/src/gcc/testsuite/lib/target-supports.exp (revision 200267) -@@ -4668,6 +4668,33 @@ +Index: b/src/gcc/testsuite/lib/target-supports.exp +=================================================================== +--- a/src/gcc/testsuite/lib/target-supports.exp ++++ b/src/gcc/testsuite/lib/target-supports.exp +@@ -4591,6 +4591,33 @@ return 0 } @@ -89,8 +93,10 @@ gcc/testsuite/ # Return 1 if the target is a VxWorks kernel. proc check_effective_target_vxworks_kernel { } { ---- a/src/gcc/testsuite/g++.dg/asan/large-func-test-1.C (revision 200266) -+++ b/src/gcc/testsuite/g++.dg/asan/large-func-test-1.C (revision 200267) +Index: b/src/gcc/testsuite/g++.dg/asan/large-func-test-1.C +=================================================================== +--- a/src/gcc/testsuite/g++.dg/asan/large-func-test-1.C ++++ b/src/gcc/testsuite/g++.dg/asan/large-func-test-1.C @@ -37,9 +37,9 @@ // { dg-output "ERROR: AddressSanitizer:? heap-buffer-overflow on address\[^\n\r]*" } @@ -104,8 +110,10 @@ gcc/testsuite/ +// { dg-output "\[^\n\r]*allocated by thread T0 here:\[^\n\r]*(\n|\r\n|\r)" } // { dg-output " #0( 0x\[0-9a-f\]+ (in _*(interceptor_|)malloc|\[(\])\[^\n\r]*(\n|\r\n|\r)" } // { dg-output " #1|) 0x\[0-9a-f\]+ (in (operator new|_*_Zn\[aw\]\[mj\])|\[(\])\[^\n\r]*(\n|\r\n|\r)" } ---- a/src/gcc/testsuite/g++.dg/asan/deep-thread-stack-1.C (revision 200266) -+++ b/src/gcc/testsuite/g++.dg/asan/deep-thread-stack-1.C (revision 200267) +Index: b/src/gcc/testsuite/g++.dg/asan/deep-thread-stack-1.C +=================================================================== +--- a/src/gcc/testsuite/g++.dg/asan/deep-thread-stack-1.C ++++ b/src/gcc/testsuite/g++.dg/asan/deep-thread-stack-1.C @@ -45,9 +45,9 @@ } @@ -119,8 +127,10 @@ gcc/testsuite/ // { dg-output "Thread T\\2 created by T(\[0-9\]+) here:.*(\n|\r\n|\r)" } // { dg-output "Thread T\\8 created by T0 here:.*(\n|\r\n|\r)" } // { dg-output "Thread T\\4 created by T(\[0-9\]+) here:.*(\n|\r\n|\r)" } ---- a/src/gcc/testsuite/c-c++-common/asan/strncpy-overflow-1.c (revision 200266) -+++ b/src/gcc/testsuite/c-c++-common/asan/strncpy-overflow-1.c (revision 200267) +Index: b/src/gcc/testsuite/c-c++-common/asan/strncpy-overflow-1.c +=================================================================== +--- a/src/gcc/testsuite/c-c++-common/asan/strncpy-overflow-1.c ++++ b/src/gcc/testsuite/c-c++-common/asan/strncpy-overflow-1.c @@ -15,7 +15,7 @@ /* { dg-output "WRITE of size \[0-9\]* at 0x\[0-9a-f\]+ thread T0\[^\n\r]*(\n|\r\n|\r)" } */ /* { dg-output " #0 0x\[0-9a-f\]+ (in _*(interceptor_|)strncpy|\[(\])\[^\n\r]*(\n|\r\n|\r)" } */ @@ -131,8 +141,10 @@ gcc/testsuite/ +/* { dg-output "\[^\n\r]*allocated by thread T0 here:\[^\n\r]*(\n|\r\n|\r)" } */ /* { dg-output " #0 0x\[0-9a-f\]+ (in _*(interceptor_|)malloc|\[(\])\[^\n\r]*(\n|\r\n|\r)" } */ /* { dg-output " #1 0x\[0-9a-f\]+ (in _*main (\[^\n\r]*strncpy-overflow-1.c:10|\[^\n\r]*:0)|\[(\])\[^\n\r]*(\n|\r\n|\r)" } */ ---- a/src/gcc/testsuite/c-c++-common/asan/rlimit-mmap-test-1.c (revision 200266) -+++ b/src/gcc/testsuite/c-c++-common/asan/rlimit-mmap-test-1.c (revision 200267) +Index: b/src/gcc/testsuite/c-c++-common/asan/rlimit-mmap-test-1.c +=================================================================== +--- a/src/gcc/testsuite/c-c++-common/asan/rlimit-mmap-test-1.c ++++ b/src/gcc/testsuite/c-c++-common/asan/rlimit-mmap-test-1.c @@ -2,6 +2,7 @@ /* { dg-do run { target setrlimit } } */ @@ -141,16 +153,20 @@ gcc/testsuite/ /* { dg-shouldfail "asan" } */ #include <stdlib.h> ---- a/src/gcc/testsuite/c-c++-common/asan/stack-overflow-1.c (revision 200266) -+++ b/src/gcc/testsuite/c-c++-common/asan/stack-overflow-1.c (revision 200267) +Index: b/src/gcc/testsuite/c-c++-common/asan/stack-overflow-1.c +=================================================================== +--- a/src/gcc/testsuite/c-c++-common/asan/stack-overflow-1.c ++++ b/src/gcc/testsuite/c-c++-common/asan/stack-overflow-1.c @@ -19,4 +19,4 @@ /* { dg-output "READ of size 1 at 0x\[0-9a-f\]+ thread T0\[^\n\r]*(\n|\r\n|\r)" } */ /* { dg-output " #0 0x\[0-9a-f\]+ (in _*main (\[^\n\r]*stack-overflow-1.c:16|\[^\n\r]*:0)|\[(\]).*(\n|\r\n|\r)" } */ -/* { dg-output "Address 0x\[0-9a-f\]+ is\[^\n\r]*frame <main>" } */ +/* { dg-output "\[^\n\r]*Address 0x\[0-9a-f\]+ is\[^\n\r]*frame <main>" } */ ---- a/src/gcc/testsuite/c-c++-common/asan/use-after-free-1.c (revision 200266) -+++ b/src/gcc/testsuite/c-c++-common/asan/use-after-free-1.c (revision 200267) +Index: b/src/gcc/testsuite/c-c++-common/asan/use-after-free-1.c +=================================================================== +--- a/src/gcc/testsuite/c-c++-common/asan/use-after-free-1.c ++++ b/src/gcc/testsuite/c-c++-common/asan/use-after-free-1.c @@ -11,12 +11,12 @@ /* { dg-output "ERROR: AddressSanitizer:? heap-use-after-free on address\[^\n\r]*" } */ @@ -168,8 +184,10 @@ gcc/testsuite/ +/* { dg-output "\[^\n\r]*previously allocated by thread T0 here:\[^\n\r]*(\n|\r\n|\r)" } */ /* { dg-output " #0 0x\[0-9a-f\]+ (in _*(interceptor_|)malloc|\[(\])\[^\n\r]*(\n|\r\n|\r)" } */ /* { dg-output " #1 0x\[0-9a-f\]+ (in _*main (\[^\n\r]*use-after-free-1.c:7|\[^\n\r]*:0)|\[(\])\[^\n\r]*(\n|\r\n|\r)" } */ ---- a/src/gcc/testsuite/c-c++-common/asan/clone-test-1.c (revision 200266) -+++ b/src/gcc/testsuite/c-c++-common/asan/clone-test-1.c (revision 200267) +Index: b/src/gcc/testsuite/c-c++-common/asan/clone-test-1.c +=================================================================== +--- a/src/gcc/testsuite/c-c++-common/asan/clone-test-1.c ++++ b/src/gcc/testsuite/c-c++-common/asan/clone-test-1.c @@ -3,6 +3,7 @@ /* { dg-do run { target { *-*-linux* } } } */ @@ -178,8 +196,10 @@ gcc/testsuite/ /* { dg-options "-D_GNU_SOURCE" } */ #include <stdio.h> ---- a/src/gcc/testsuite/c-c++-common/asan/heap-overflow-1.c (revision 200266) -+++ b/src/gcc/testsuite/c-c++-common/asan/heap-overflow-1.c (revision 200267) +Index: b/src/gcc/testsuite/c-c++-common/asan/heap-overflow-1.c +=================================================================== +--- a/src/gcc/testsuite/c-c++-common/asan/heap-overflow-1.c ++++ b/src/gcc/testsuite/c-c++-common/asan/heap-overflow-1.c @@ -25,7 +25,7 @@ /* { dg-output "READ of size 1 at 0x\[0-9a-f\]+ thread T0.*(\n|\r\n|\r)" } */ @@ -190,8 +210,10 @@ gcc/testsuite/ +/* { dg-output "\[^\n\r]*allocated by thread T0 here:\[^\n\r]*(\n|\r\n|\r)" } */ /* { dg-output " #0 0x\[0-9a-f\]+ (in _*(interceptor_|)malloc|\[(\])\[^\n\r]*(\n|\r\n|\r)" } */ /* { dg-output " #1 0x\[0-9a-f\]+ (in _*main (\[^\n\r]*heap-overflow-1.c:19|\[^\n\r]*:0)|\[(\])\[^\n\r]*(\n|\r\n|\r)" } */ ---- a/src/gcc/testsuite/c-c++-common/asan/null-deref-1.c (revision 200266) -+++ b/src/gcc/testsuite/c-c++-common/asan/null-deref-1.c (revision 200267) +Index: b/src/gcc/testsuite/c-c++-common/asan/null-deref-1.c +=================================================================== +--- a/src/gcc/testsuite/c-c++-common/asan/null-deref-1.c ++++ b/src/gcc/testsuite/c-c++-common/asan/null-deref-1.c @@ -18,6 +18,6 @@ /* { dg-output "ERROR: AddressSanitizer:? SEGV on unknown address\[^\n\r]*" } */ @@ -200,9 +222,11 @@ gcc/testsuite/ +/* { dg-output "\[^\n\r]*AddressSanitizer can not provide additional info.*(\n|\r\n|\r)" } */ /* { dg-output " #0 0x\[0-9a-f\]+ (in \[^\n\r]*NullDeref\[^\n\r]* (\[^\n\r]*null-deref-1.c:10|\[^\n\r]*:0)|\[(\])\[^\n\r]*(\n|\r\n|\r)" } */ /* { dg-output " #1 0x\[0-9a-f\]+ (in _*main (\[^\n\r]*null-deref-1.c:15|\[^\n\r]*:0)|\[(\])\[^\n\r]*(\n|\r\n|\r)" } */ ---- a/src/gcc/config/arm/arm.c (revision 200266) -+++ b/src/gcc/config/arm/arm.c (revision 200267) -@@ -281,6 +281,7 @@ +Index: b/src/gcc/config/arm/arm.c +=================================================================== +--- a/src/gcc/config/arm/arm.c ++++ b/src/gcc/config/arm/arm.c +@@ -280,6 +280,7 @@ static void arm_canonicalize_comparison (int *code, rtx *op0, rtx *op1, bool op0_preserve_value); @@ -210,7 +234,7 @@ gcc/testsuite/ /* Table of machine attributes. */ static const struct attribute_spec arm_attribute_table[] = -@@ -657,6 +658,9 @@ +@@ -649,6 +650,9 @@ #define TARGET_CANONICALIZE_COMPARISON \ arm_canonicalize_comparison @@ -220,7 +244,7 @@ gcc/testsuite/ struct gcc_target targetm = TARGET_INITIALIZER; /* Obstack for minipool constant handling. */ -@@ -28276,4 +28280,12 @@ +@@ -27450,4 +27454,12 @@ } @@ -233,8 +257,10 @@ gcc/testsuite/ +} + #include "gt-arm.h" ---- a/src/gcc/config/arm/linux-eabi.h (revision 200266) -+++ b/src/gcc/config/arm/linux-eabi.h (revision 200267) +Index: b/src/gcc/config/arm/linux-eabi.h +=================================================================== +--- a/src/gcc/config/arm/linux-eabi.h ++++ b/src/gcc/config/arm/linux-eabi.h @@ -84,10 +84,14 @@ LINUX_OR_ANDROID_LD (LINUX_TARGET_LINK_SPEC, \ LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC) diff --git a/debian/patches/config-ml.diff b/debian/patches/config-ml.diff index b2a7acc..ca23967 100644 --- a/debian/patches/config-ml.diff +++ b/debian/patches/config-ml.diff @@ -3,8 +3,8 @@ Index: b/src/config-ml.in =================================================================== ---- a/src/config-ml.in 2013-05-11 20:45:43.490271752 +0000 -+++ b/src/config-ml.in 2013-05-11 20:45:43.414271243 +0000 +--- a/src/config-ml.in ++++ b/src/config-ml.in @@ -467,6 +467,25 @@ ;; esac @@ -91,9 +91,9 @@ Index: b/src/config-ml.in exit 1 Index: b/src/libstdc++-v3/include/Makefile.am =================================================================== ---- a/src/libstdc++-v3/include/Makefile.am 2013-05-11 20:45:43.490271752 +0000 -+++ b/src/libstdc++-v3/include/Makefile.am 2013-05-11 20:47:20.646921114 +0000 -@@ -825,8 +825,9 @@ +--- a/src/libstdc++-v3/include/Makefile.am ++++ b/src/libstdc++-v3/include/Makefile.am +@@ -826,8 +826,9 @@ endif host_srcdir = ${glibcxx_srcdir}/$(OS_INC_SRCDIR) @@ -105,7 +105,7 @@ Index: b/src/libstdc++-v3/include/Makefile.am host_headers = \ ${host_srcdir}/ctype_base.h \ ${host_srcdir}/ctype_inline.h \ -@@ -1047,6 +1048,7 @@ +@@ -1048,6 +1049,7 @@ stamp-${host_alias}: @-mkdir -p ${host_builddir} @-mkdir -p ${host_builddir}/../ext @@ -115,8 +115,8 @@ Index: b/src/libstdc++-v3/include/Makefile.am # Host includes static. Index: b/src/libstdc++-v3/include/Makefile.in =================================================================== ---- a/src/libstdc++-v3/include/Makefile.in 2013-05-11 20:45:43.490271752 +0000 -+++ b/src/libstdc++-v3/include/Makefile.in 2013-05-11 20:47:36.843028205 +0000 +--- a/src/libstdc++-v3/include/Makefile.in ++++ b/src/libstdc++-v3/include/Makefile.in @@ -202,6 +202,7 @@ check_msgfmt = @check_msgfmt@ datadir = @datadir@ @@ -125,7 +125,7 @@ Index: b/src/libstdc++-v3/include/Makefile.in docdir = @docdir@ dvidir = @dvidir@ enable_shared = @enable_shared@ -@@ -1080,8 +1081,8 @@ +@@ -1081,8 +1082,8 @@ # For --enable-cheaders=c_std @GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE@c_compatibility_headers_extra = ${c_compatibility_headers} host_srcdir = ${glibcxx_srcdir}/$(OS_INC_SRCDIR) @@ -136,7 +136,7 @@ Index: b/src/libstdc++-v3/include/Makefile.in host_headers = \ ${host_srcdir}/ctype_base.h \ ${host_srcdir}/ctype_inline.h \ -@@ -1460,6 +1461,7 @@ +@@ -1461,6 +1462,7 @@ stamp-${host_alias}: @-mkdir -p ${host_builddir} @-mkdir -p ${host_builddir}/../ext @@ -146,8 +146,8 @@ Index: b/src/libstdc++-v3/include/Makefile.in # Host includes static. Index: b/src/libstdc++-v3/configure.ac =================================================================== ---- a/src/libstdc++-v3/configure.ac 2013-05-11 20:45:43.490271752 +0000 -+++ b/src/libstdc++-v3/configure.ac 2013-05-11 20:45:43.490271752 +0000 +--- a/src/libstdc++-v3/configure.ac ++++ b/src/libstdc++-v3/configure.ac @@ -461,6 +461,16 @@ multilib_arg= fi diff --git a/debian/patches/gcc-base-version.diff b/debian/patches/gcc-base-version.diff index 31bbf75..97836b8 100644 --- a/debian/patches/gcc-base-version.diff +++ b/debian/patches/gcc-base-version.diff @@ -114,7 +114,7 @@ Index: b/src/gcc/Makefile.in > tmp-gcov-iov.h $(SHELL) $(srcdir)/../move-if-change tmp-gcov-iov.h gcov-iov.h $(STAMP) s-iov -@@ -4302,8 +4304,8 @@ +@@ -4281,8 +4283,8 @@ TEXI_CPPINT_FILES = cppinternals.texi gcc-common.texi gcc-vers.texi # gcc-vers.texi is generated from the version files. @@ -125,7 +125,7 @@ Index: b/src/gcc/Makefile.in if [ "$(DEVPHASE_c)" = "experimental" ]; \ then echo "@set DEVELOPMENT"; \ else echo "@clear DEVELOPMENT"; \ -@@ -4701,9 +4703,11 @@ +@@ -4660,9 +4662,11 @@ install-driver: installdirs xgcc$(exeext) -rm -f $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext) -$(INSTALL_PROGRAM) xgcc$(exeext) $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext) diff --git a/debian/patches/gcc-hash-style-gnu.diff b/debian/patches/gcc-hash-style-gnu.diff index 5f348c6..204ecc7 100644 --- a/debian/patches/gcc-hash-style-gnu.diff +++ b/debian/patches/gcc-hash-style-gnu.diff @@ -158,8 +158,8 @@ Index: b/src/gcc/config/aarch64/aarch64-linux.h =================================================================== --- a/src/gcc/config/aarch64/aarch64-linux.h +++ b/src/gcc/config/aarch64/aarch64-linux.h -@@ -24,6 +24,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64.so.1" +@@ -26,6 +26,7 @@ + #define CPP_SPEC "%{pthread:-D_REENTRANT}" #define LINUX_TARGET_LINK_SPEC "%{h*} \ + --hash-style=gnu \ diff --git a/debian/patches/gcc-ice-apport.diff b/debian/patches/gcc-ice-apport.diff index 22a4fc9..f9da79c 100644 --- a/debian/patches/gcc-ice-apport.diff +++ b/debian/patches/gcc-ice-apport.diff @@ -5,7 +5,7 @@ Index: b/src/gcc/gcc.c =================================================================== --- a/src/gcc/gcc.c +++ b/src/gcc/gcc.c -@@ -6254,6 +6254,16 @@ +@@ -6256,6 +6256,16 @@ fnotice (stderr, "Preprocessed source stored into %s file," " please attach this to your bugreport.\n", temp_filenames[attempt * 2]); diff --git a/debian/patches/gcc-ice-hack.diff b/debian/patches/gcc-ice-hack.diff index 4bb2f12..b9cdc48 100644 --- a/debian/patches/gcc-ice-hack.diff +++ b/debian/patches/gcc-ice-hack.diff @@ -36,7 +36,7 @@ Index: b/src/gcc/gcc.c static const char *getenv_spec_function (int, const char **); static const char *if_exists_spec_function (int, const char **); -@@ -2771,7 +2774,7 @@ +@@ -2773,7 +2776,7 @@ } } @@ -45,7 +45,7 @@ Index: b/src/gcc/gcc.c free (CONST_CAST (char *, string)); } -@@ -2824,6 +2827,16 @@ +@@ -2826,6 +2829,16 @@ else if (WIFEXITED (status) && WEXITSTATUS (status) >= MIN_FATAL_STATUS) { @@ -62,7 +62,7 @@ Index: b/src/gcc/gcc.c if (WEXITSTATUS (status) > greatest_status) greatest_status = WEXITSTATUS (status); ret_code = -1; -@@ -2881,6 +2894,9 @@ +@@ -2883,6 +2896,9 @@ } } @@ -72,7 +72,7 @@ Index: b/src/gcc/gcc.c return ret_code; } } -@@ -6034,6 +6050,227 @@ +@@ -6036,6 +6052,227 @@ switches[switchnum].validated = true; } diff --git a/debian/patches/gcc-multiarch.diff b/debian/patches/gcc-multiarch.diff index 2bb879e..c471d3c 100644 --- a/debian/patches/gcc-multiarch.diff +++ b/debian/patches/gcc-multiarch.diff @@ -13,6 +13,8 @@ * config/s390/t-linux64: Set MULTIARCH_DIRNAME. * config/sparc/t-linux64: Set MULTIARCH_DIRNAME. +Index: b/src/libstdc++-v3/python/hook.in +=================================================================== --- a/src/libstdc++-v3/python/hook.in +++ b/src/libstdc++-v3/python/hook.in @@ -47,14 +47,18 @@ @@ -127,7 +129,7 @@ Index: b/src/gcc/config.gcc =================================================================== --- a/src/gcc/config.gcc +++ b/src/gcc/config.gcc -@@ -1799,8 +1799,11 @@ +@@ -1806,8 +1806,11 @@ mips64*-*-linux* | mipsisa64*-*-linux*) tm_file="dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/gnu-user64.h mips/linux64.h mips/linux-common.h" tmake_file="${tmake_file} mips/t-linux64" @@ -140,7 +142,7 @@ Index: b/src/gcc/config.gcc mips64el-st-linux-gnu) tm_file="${tm_file} mips/st.h" tmake_file="${tmake_file} mips/t-st" -@@ -3709,7 +3712,7 @@ +@@ -3723,7 +3726,7 @@ i[34567]86-*-darwin* | x86_64-*-darwin*) ;; i[34567]86-*-linux* | x86_64-*-linux*) diff --git a/debian/patches/gcc-ppc64el.diff b/debian/patches/gcc-ppc64el.diff index 44df592..f8574ef 100644 --- a/debian/patches/gcc-ppc64el.diff +++ b/debian/patches/gcc-ppc64el.diff @@ -1887,24 +1887,6 @@ LANG=C svn diff svn://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch@204974 \ LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) -@@ -17828,7 +17834,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 17831 "configure" -+#line 17837 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -17934,7 +17940,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 17937 "configure" -+#line 17943 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H --- a/src/gcc/builtins.c +++ b/src/gcc/builtins.c @@ -5846,6 +5846,9 @@ diff --git a/debian/patches/gcc-target-include-asm.diff b/debian/patches/gcc-target-include-asm.diff index b68d3ff..c44b917 100644 --- a/debian/patches/gcc-target-include-asm.diff +++ b/debian/patches/gcc-target-include-asm.diff @@ -4,7 +4,7 @@ Index: b/src/configure.ac =================================================================== --- a/src/configure.ac +++ b/src/configure.ac -@@ -2964,7 +2964,7 @@ +@@ -2967,7 +2967,7 @@ # being built; programs in there won't even run. if test "${build}" = "${host}" && test -d ${srcdir}/gcc; then # Search for pre-installed headers if nothing else fits. diff --git a/debian/patches/gcc-textdomain.diff b/debian/patches/gcc-textdomain.diff index 06fce4a..68b8878 100644 --- a/debian/patches/gcc-textdomain.diff +++ b/debian/patches/gcc-textdomain.diff @@ -19,7 +19,7 @@ Index: b/src/gcc/Makefile.in =================================================================== --- a/src/gcc/Makefile.in +++ b/src/gcc/Makefile.in -@@ -5304,8 +5304,8 @@ +@@ -5260,8 +5260,8 @@ dir=$(localedir)/$$lang/LC_MESSAGES; \ echo $(mkinstalldirs) $(DESTDIR)$$dir; \ $(mkinstalldirs) $(DESTDIR)$$dir || exit 1; \ diff --git a/debian/patches/gccgo-version.diff b/debian/patches/gccgo-version.diff index 6946679..ae15f09 100644 --- a/debian/patches/gccgo-version.diff +++ b/debian/patches/gccgo-version.diff @@ -4,7 +4,7 @@ Index: b/src/gcc/go/Make-lang.in =================================================================== --- a/src/gcc/go/Make-lang.in +++ b/src/gcc/go/Make-lang.in -@@ -244,7 +244,9 @@ +@@ -243,7 +243,9 @@ $(TM_H) $(RTL_H) $(TREE_H) $(TM_P_H) output.h $(TARGET_H) \ $(COMMON_TARGET_H) @@ -19,7 +19,7 @@ Index: b/src/libgo/Makefile.in =================================================================== --- a/src/libgo/Makefile.in +++ b/src/libgo/Makefile.in -@@ -431,14 +431,14 @@ +@@ -430,14 +430,14 @@ SUFFIXES = .c .go .gox .o .obj .lo .a @LIBGO_IS_RTEMS_TRUE@subdirs = testsuite SUBDIRS = ${subdirs} diff --git a/debian/patches/gdc-4.8.diff b/debian/patches/gdc-4.8.diff index b4b042f..d2d276c 100644 --- a/debian/patches/gdc-4.8.diff +++ b/debian/patches/gdc-4.8.diff @@ -1,9 +1,11 @@ # DP: This implements D language support in the GCC back end, and adds # DP: relevant documentation about the GDC front end (code part). +Index: b/src/gcc/config/rs6000/rs6000.c +=================================================================== --- a/src/gcc/config/rs6000/rs6000.c +++ b/src/gcc/config/rs6000/rs6000.c -@@ -21578,7 +21578,8 @@ rs6000_output_function_epilogue (FILE *f +@@ -21584,7 +21584,8 @@ either, so for now use 0. */ if (! strcmp (language_string, "GNU C") || ! strcmp (language_string, "GNU GIMPLE") @@ -13,9 +15,11 @@ i = 0; else if (! strcmp (language_string, "GNU F77") || ! strcmp (language_string, "GNU Fortran")) +Index: b/src/gcc/dwarf2out.c +=================================================================== --- a/src/gcc/dwarf2out.c +++ b/src/gcc/dwarf2out.c -@@ -18907,6 +18907,8 @@ gen_compile_unit_die (const char *filena +@@ -18909,6 +18909,8 @@ language = DW_LANG_C89; if (strcmp (language_string, "GNU C++") == 0) language = DW_LANG_C_plus_plus; @@ -24,9 +28,11 @@ else if (strcmp (language_string, "GNU F77") == 0) language = DW_LANG_Fortran77; else if (strcmp (language_string, "GNU Pascal") == 0) +Index: b/src/gcc/gcc.c +=================================================================== --- a/src/gcc/gcc.c +++ b/src/gcc/gcc.c -@@ -1002,6 +1002,7 @@ static const struct compiler default_com +@@ -1003,6 +1003,7 @@ {".java", "#Java", 0, 0, 0}, {".class", "#Java", 0, 0, 0}, {".zip", "#Java", 0, 0, 0}, {".jar", "#Java", 0, 0, 0}, {".go", "#Go", 0, 1, 0}, diff --git a/debian/patches/gdc-libphobos-build.diff b/debian/patches/gdc-libphobos-build.diff index 4f28d8f..ef56771 100644 --- a/debian/patches/gdc-libphobos-build.diff +++ b/debian/patches/gdc-libphobos-build.diff @@ -1,8 +1,10 @@ # DP: This implements building of libphobos library in GCC. +Index: b/src/configure +=================================================================== --- a/src/configure +++ b/src/configure -@@ -2781,7 +2781,8 @@ target_libraries="target-libgcc \ +@@ -2781,7 +2781,8 @@ ${libgcj} \ target-libobjc \ target-libada \ @@ -12,6 +14,8 @@ # these tools are built using the target libraries, and are intended to # run only in the target environment +Index: b/src/configure.ac +=================================================================== --- a/src/configure.ac +++ b/src/configure.ac @@ -164,6 +164,7 @@ @@ -22,9 +26,11 @@ target-boehm-gc \ ${libgcj} \ target-libobjc \ +Index: b/src/Makefile.def +=================================================================== --- a/src/Makefile.def +++ b/src/Makefile.def -@@ -131,6 +131,7 @@ target_modules = { module= libquadmath; +@@ -131,6 +131,7 @@ target_modules = { module= libgfortran; }; target_modules = { module= libobjc; }; target_modules = { module= libgo; }; @@ -32,7 +38,7 @@ target_modules = { module= libtermcap; no_check=true; missing=mostlyclean; missing=clean; -@@ -505,6 +506,8 @@ dependencies = { module=configure-target +@@ -505,6 +506,8 @@ dependencies = { module=all-target-libgo; on=all-target-libbacktrace; }; dependencies = { module=all-target-libgo; on=all-target-libffi; }; dependencies = { module=all-target-libgo; on=all-target-libatomic; }; @@ -41,7 +47,7 @@ dependencies = { module=configure-target-libjava; on=configure-target-zlib; }; dependencies = { module=configure-target-libjava; on=configure-target-boehm-gc; }; dependencies = { module=configure-target-libjava; on=configure-target-libffi; }; -@@ -560,6 +563,8 @@ languages = { language=objc; gcc-check-t +@@ -560,6 +563,8 @@ languages = { language=obj-c++; gcc-check-target=check-obj-c++; }; languages = { language=go; gcc-check-target=check-go; lib-check-target=check-target-libgo; }; @@ -50,9 +56,11 @@ // Toplevel bootstrap bootstrap_stage = { id=1 ; }; +Index: b/src/Makefile.in +=================================================================== --- a/src/Makefile.in +++ b/src/Makefile.in -@@ -933,6 +933,7 @@ configure-target: \ +@@ -933,6 +933,7 @@ maybe-configure-target-libgfortran \ maybe-configure-target-libobjc \ maybe-configure-target-libgo \ @@ -60,7 +68,7 @@ maybe-configure-target-libtermcap \ maybe-configure-target-winsup \ maybe-configure-target-libgloss \ -@@ -1086,6 +1087,7 @@ all-target: maybe-all-target-libquadmath +@@ -1086,6 +1087,7 @@ all-target: maybe-all-target-libgfortran all-target: maybe-all-target-libobjc all-target: maybe-all-target-libgo @@ -68,7 +76,7 @@ all-target: maybe-all-target-libtermcap all-target: maybe-all-target-winsup all-target: maybe-all-target-libgloss -@@ -1175,6 +1177,7 @@ info-target: maybe-info-target-libquadma +@@ -1175,6 +1177,7 @@ info-target: maybe-info-target-libgfortran info-target: maybe-info-target-libobjc info-target: maybe-info-target-libgo @@ -76,7 +84,7 @@ info-target: maybe-info-target-libtermcap info-target: maybe-info-target-winsup info-target: maybe-info-target-libgloss -@@ -1257,6 +1260,7 @@ dvi-target: maybe-dvi-target-libquadmath +@@ -1257,6 +1260,7 @@ dvi-target: maybe-dvi-target-libgfortran dvi-target: maybe-dvi-target-libobjc dvi-target: maybe-dvi-target-libgo @@ -84,7 +92,7 @@ dvi-target: maybe-dvi-target-libtermcap dvi-target: maybe-dvi-target-winsup dvi-target: maybe-dvi-target-libgloss -@@ -1339,6 +1343,7 @@ pdf-target: maybe-pdf-target-libquadmath +@@ -1339,6 +1343,7 @@ pdf-target: maybe-pdf-target-libgfortran pdf-target: maybe-pdf-target-libobjc pdf-target: maybe-pdf-target-libgo @@ -92,7 +100,7 @@ pdf-target: maybe-pdf-target-libtermcap pdf-target: maybe-pdf-target-winsup pdf-target: maybe-pdf-target-libgloss -@@ -1421,6 +1426,7 @@ html-target: maybe-html-target-libquadma +@@ -1421,6 +1426,7 @@ html-target: maybe-html-target-libgfortran html-target: maybe-html-target-libobjc html-target: maybe-html-target-libgo @@ -100,7 +108,7 @@ html-target: maybe-html-target-libtermcap html-target: maybe-html-target-winsup html-target: maybe-html-target-libgloss -@@ -1503,6 +1509,7 @@ TAGS-target: maybe-TAGS-target-libquadma +@@ -1503,6 +1509,7 @@ TAGS-target: maybe-TAGS-target-libgfortran TAGS-target: maybe-TAGS-target-libobjc TAGS-target: maybe-TAGS-target-libgo @@ -108,7 +116,7 @@ TAGS-target: maybe-TAGS-target-libtermcap TAGS-target: maybe-TAGS-target-winsup TAGS-target: maybe-TAGS-target-libgloss -@@ -1585,6 +1592,7 @@ install-info-target: maybe-install-info- +@@ -1585,6 +1592,7 @@ install-info-target: maybe-install-info-target-libgfortran install-info-target: maybe-install-info-target-libobjc install-info-target: maybe-install-info-target-libgo @@ -116,7 +124,7 @@ install-info-target: maybe-install-info-target-libtermcap install-info-target: maybe-install-info-target-winsup install-info-target: maybe-install-info-target-libgloss -@@ -1667,6 +1675,7 @@ install-pdf-target: maybe-install-pdf-ta +@@ -1667,6 +1675,7 @@ install-pdf-target: maybe-install-pdf-target-libgfortran install-pdf-target: maybe-install-pdf-target-libobjc install-pdf-target: maybe-install-pdf-target-libgo @@ -124,7 +132,7 @@ install-pdf-target: maybe-install-pdf-target-libtermcap install-pdf-target: maybe-install-pdf-target-winsup install-pdf-target: maybe-install-pdf-target-libgloss -@@ -1749,6 +1758,7 @@ install-html-target: maybe-install-html- +@@ -1749,6 +1758,7 @@ install-html-target: maybe-install-html-target-libgfortran install-html-target: maybe-install-html-target-libobjc install-html-target: maybe-install-html-target-libgo @@ -132,7 +140,7 @@ install-html-target: maybe-install-html-target-libtermcap install-html-target: maybe-install-html-target-winsup install-html-target: maybe-install-html-target-libgloss -@@ -1831,6 +1841,7 @@ installcheck-target: maybe-installcheck- +@@ -1831,6 +1841,7 @@ installcheck-target: maybe-installcheck-target-libgfortran installcheck-target: maybe-installcheck-target-libobjc installcheck-target: maybe-installcheck-target-libgo @@ -140,7 +148,7 @@ installcheck-target: maybe-installcheck-target-libtermcap installcheck-target: maybe-installcheck-target-winsup installcheck-target: maybe-installcheck-target-libgloss -@@ -1913,6 +1924,7 @@ mostlyclean-target: maybe-mostlyclean-ta +@@ -1913,6 +1924,7 @@ mostlyclean-target: maybe-mostlyclean-target-libgfortran mostlyclean-target: maybe-mostlyclean-target-libobjc mostlyclean-target: maybe-mostlyclean-target-libgo @@ -148,7 +156,7 @@ mostlyclean-target: maybe-mostlyclean-target-libtermcap mostlyclean-target: maybe-mostlyclean-target-winsup mostlyclean-target: maybe-mostlyclean-target-libgloss -@@ -1995,6 +2007,7 @@ clean-target: maybe-clean-target-libquad +@@ -1995,6 +2007,7 @@ clean-target: maybe-clean-target-libgfortran clean-target: maybe-clean-target-libobjc clean-target: maybe-clean-target-libgo @@ -156,7 +164,7 @@ clean-target: maybe-clean-target-libtermcap clean-target: maybe-clean-target-winsup clean-target: maybe-clean-target-libgloss -@@ -2077,6 +2090,7 @@ distclean-target: maybe-distclean-target +@@ -2077,6 +2090,7 @@ distclean-target: maybe-distclean-target-libgfortran distclean-target: maybe-distclean-target-libobjc distclean-target: maybe-distclean-target-libgo @@ -164,7 +172,7 @@ distclean-target: maybe-distclean-target-libtermcap distclean-target: maybe-distclean-target-winsup distclean-target: maybe-distclean-target-libgloss -@@ -2159,6 +2173,7 @@ maintainer-clean-target: maybe-maintaine +@@ -2159,6 +2173,7 @@ maintainer-clean-target: maybe-maintainer-clean-target-libgfortran maintainer-clean-target: maybe-maintainer-clean-target-libobjc maintainer-clean-target: maybe-maintainer-clean-target-libgo @@ -172,7 +180,7 @@ maintainer-clean-target: maybe-maintainer-clean-target-libtermcap maintainer-clean-target: maybe-maintainer-clean-target-winsup maintainer-clean-target: maybe-maintainer-clean-target-libgloss -@@ -2296,6 +2311,7 @@ check-target: \ +@@ -2296,6 +2311,7 @@ maybe-check-target-libgfortran \ maybe-check-target-libobjc \ maybe-check-target-libgo \ @@ -180,7 +188,7 @@ maybe-check-target-libtermcap \ maybe-check-target-winsup \ maybe-check-target-libgloss \ -@@ -2451,6 +2467,7 @@ install-target: \ +@@ -2451,6 +2467,7 @@ maybe-install-target-libgfortran \ maybe-install-target-libobjc \ maybe-install-target-libgo \ @@ -188,7 +196,7 @@ maybe-install-target-libtermcap \ maybe-install-target-winsup \ maybe-install-target-libgloss \ -@@ -2553,6 +2570,7 @@ install-strip-target: \ +@@ -2553,6 +2570,7 @@ maybe-install-strip-target-libgfortran \ maybe-install-strip-target-libobjc \ maybe-install-strip-target-libgo \ @@ -196,7 +204,7 @@ maybe-install-strip-target-libtermcap \ maybe-install-strip-target-winsup \ maybe-install-strip-target-libgloss \ -@@ -37320,6 +37338,463 @@ maintainer-clean-target-libgo: +@@ -37320,6 +37338,463 @@ @@ -660,7 +668,7 @@ .PHONY: configure-target-libtermcap maybe-configure-target-libtermcap maybe-configure-target-libtermcap: @if gcc-bootstrap -@@ -43354,6 +43829,14 @@ check-gcc-go: +@@ -43344,6 +43819,14 @@ (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-go); check-go: check-gcc-go check-target-libgo @@ -675,7 +683,7 @@ # The gcc part of install-no-fixedincludes, which relies on an intimate # knowledge of how a number of gcc internal targets (inter)operate. Delegate. -@@ -45407,6 +45890,7 @@ configure-target-libquadmath: stage_last +@@ -45397,6 +45880,7 @@ configure-target-libgfortran: stage_last configure-target-libobjc: stage_last configure-target-libgo: stage_last @@ -683,7 +691,7 @@ configure-target-libtermcap: stage_last configure-target-winsup: stage_last configure-target-libgloss: stage_last -@@ -45438,6 +45922,7 @@ configure-target-libquadmath: maybe-all- +@@ -45428,6 +45912,7 @@ configure-target-libgfortran: maybe-all-gcc configure-target-libobjc: maybe-all-gcc configure-target-libgo: maybe-all-gcc @@ -691,7 +699,7 @@ configure-target-libtermcap: maybe-all-gcc configure-target-winsup: maybe-all-gcc configure-target-libgloss: maybe-all-gcc -@@ -46180,6 +46665,8 @@ configure-target-libgo: maybe-all-target +@@ -46170,6 +46655,8 @@ all-target-libgo: maybe-all-target-libbacktrace all-target-libgo: maybe-all-target-libffi all-target-libgo: maybe-all-target-libatomic @@ -700,7 +708,7 @@ configure-target-libjava: maybe-configure-target-zlib configure-target-libjava: maybe-configure-target-boehm-gc configure-target-libjava: maybe-configure-target-libffi -@@ -46266,6 +46753,7 @@ configure-target-libquadmath: maybe-all- +@@ -46256,6 +46743,7 @@ configure-target-libgfortran: maybe-all-target-libgcc configure-target-libobjc: maybe-all-target-libgcc configure-target-libgo: maybe-all-target-libgcc @@ -708,7 +716,7 @@ configure-target-libtermcap: maybe-all-target-libgcc configure-target-winsup: maybe-all-target-libgcc configure-target-libgloss: maybe-all-target-libgcc -@@ -46301,6 +46789,8 @@ configure-target-libobjc: maybe-all-targ +@@ -46291,6 +46779,8 @@ configure-target-libgo: maybe-all-target-newlib maybe-all-target-libgloss diff --git a/debian/patches/gdc-versym-cpu.diff b/debian/patches/gdc-versym-cpu.diff index b2ac9a9..b777f99 100644 --- a/debian/patches/gdc-versym-cpu.diff +++ b/debian/patches/gdc-versym-cpu.diff @@ -43,6 +43,8 @@ for all supported architectures. And these where appropriate: ** SPARC_HardFloat ** SPARC_SoftFloat +Index: b/src/gcc/config/aarch64/aarch64.h +=================================================================== --- a/src/gcc/config/aarch64/aarch64.h +++ b/src/gcc/config/aarch64/aarch64.h @@ -51,6 +51,14 @@ @@ -60,9 +62,11 @@ for all supported architectures. And these where appropriate: /* Target machine storage layout. */ +Index: b/src/gcc/config/alpha/alpha.h +=================================================================== --- a/src/gcc/config/alpha/alpha.h +++ b/src/gcc/config/alpha/alpha.h -@@ -72,6 +72,23 @@ along with GCC; see the file COPYING3. +@@ -72,6 +72,23 @@ SUBTARGET_LANGUAGE_CPP_BUILTINS(); \ } while (0) @@ -86,9 +90,11 @@ for all supported architectures. And these where appropriate: #ifndef SUBTARGET_LANGUAGE_CPP_BUILTINS #define SUBTARGET_LANGUAGE_CPP_BUILTINS() \ do \ +Index: b/src/gcc/config/arm/arm.h +=================================================================== --- a/src/gcc/config/arm/arm.h +++ b/src/gcc/config/arm/arm.h -@@ -158,6 +158,31 @@ extern char arm_arch_name[]; +@@ -158,6 +158,31 @@ builtin_define ("__ARM_ARCH_EXT_IDIV__"); \ } while (0) @@ -120,9 +126,11 @@ for all supported architectures. And these where appropriate: #include "config/arm/arm-opts.h" enum target_cpus +Index: b/src/gcc/config/i386/i386.h +=================================================================== --- a/src/gcc/config/i386/i386.h +++ b/src/gcc/config/i386/i386.h -@@ -588,6 +588,24 @@ extern const char *host_detect_local_cpu +@@ -588,6 +588,24 @@ /* Target CPU builtins. */ #define TARGET_CPU_CPP_BUILTINS() ix86_target_macros () @@ -147,9 +155,11 @@ for all supported architectures. And these where appropriate: /* Target Pragmas. */ #define REGISTER_TARGET_PRAGMAS() ix86_register_pragmas () +Index: b/src/gcc/config/ia64/ia64.h +=================================================================== --- a/src/gcc/config/ia64/ia64.h +++ b/src/gcc/config/ia64/ia64.h -@@ -40,6 +40,13 @@ do { \ +@@ -40,6 +40,13 @@ builtin_define("__BIG_ENDIAN__"); \ } while (0) @@ -163,9 +173,11 @@ for all supported architectures. And these where appropriate: #ifndef SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS #endif +Index: b/src/gcc/config/mips/mips.h +=================================================================== --- a/src/gcc/config/mips/mips.h +++ b/src/gcc/config/mips/mips.h -@@ -551,6 +551,54 @@ struct mips_cpu_info { +@@ -551,6 +551,54 @@ } \ while (0) @@ -220,9 +232,11 @@ for all supported architectures. And these where appropriate: /* Default target_flags if no switches are specified */ #ifndef TARGET_DEFAULT +Index: b/src/gcc/config/pa/pa.h +=================================================================== --- a/src/gcc/config/pa/pa.h +++ b/src/gcc/config/pa/pa.h -@@ -185,6 +185,20 @@ do { \ +@@ -185,6 +185,20 @@ builtin_define("_PA_RISC1_0"); \ } while (0) @@ -243,9 +257,11 @@ for all supported architectures. And these where appropriate: /* An old set of OS defines for various BSD-like systems. */ #define TARGET_OS_CPP_BUILTINS() \ do \ +Index: b/src/gcc/config/rs6000/rs6000.h +=================================================================== --- a/src/gcc/config/rs6000/rs6000.h +++ b/src/gcc/config/rs6000/rs6000.h -@@ -613,6 +613,28 @@ extern unsigned char rs6000_recip_bits[] +@@ -613,6 +613,28 @@ #define TARGET_CPU_CPP_BUILTINS() \ rs6000_cpu_cpp_builtins (pfile) @@ -274,10 +290,12 @@ for all supported architectures. And these where appropriate: /* This is used by rs6000_cpu_cpp_builtins to indicate the byte order we're compiling for. Some configurations may need to override it. */ #define RS6000_CPU_CPP_ENDIAN_BUILTINS() \ +Index: b/src/gcc/config/s390/s390.h +=================================================================== --- a/src/gcc/config/s390/s390.h +++ b/src/gcc/config/s390/s390.h -@@ -108,6 +108,22 @@ enum processor_flags - } \ +@@ -114,6 +114,22 @@ + } \ while (0) +/* Target CPU builtins for D. */ @@ -297,11 +315,13 @@ for all supported architectures. And these where appropriate: + while (0) + #ifdef DEFAULT_TARGET_64BIT - #define TARGET_DEFAULT (MASK_64BIT | MASK_ZARCH | MASK_HARD_DFP) + #define TARGET_DEFAULT (MASK_64BIT | MASK_ZARCH | MASK_HARD_DFP | MASK_OPT_HTM) #else +Index: b/src/gcc/config/sh/sh.h +=================================================================== --- a/src/gcc/config/sh/sh.h +++ b/src/gcc/config/sh/sh.h -@@ -31,6 +31,22 @@ extern int code_for_indirect_jump_scratc +@@ -31,6 +31,22 @@ #define TARGET_CPU_CPP_BUILTINS() sh_cpu_cpp_builtins (pfile) @@ -324,9 +344,11 @@ for all supported architectures. And these where appropriate: /* Value should be nonzero if functions must have frame pointers. Zero means the frame pointer need not be set up (and parms may be accessed via the stack pointer) in functions that seem suitable. */ +Index: b/src/gcc/config/sparc/sparc.h +=================================================================== --- a/src/gcc/config/sparc/sparc.h +++ b/src/gcc/config/sparc/sparc.h -@@ -27,6 +27,31 @@ along with GCC; see the file COPYING3. +@@ -27,6 +27,31 @@ #define TARGET_CPU_CPP_BUILTINS() sparc_target_macros () diff --git a/debian/patches/gdc-versym-os.diff b/debian/patches/gdc-versym-os.diff index b13b43a..282d34f 100644 --- a/debian/patches/gdc-versym-os.diff +++ b/debian/patches/gdc-versym-os.diff @@ -32,9 +32,11 @@ These official OS versions are not implemented: * SkyOS * SysV3 +Index: b/src/gcc/config/alpha/linux.h +=================================================================== --- a/src/gcc/config/alpha/linux.h +++ b/src/gcc/config/alpha/linux.h -@@ -33,6 +33,16 @@ along with GCC; see the file COPYING3. +@@ -33,6 +33,16 @@ builtin_define ("_GNU_SOURCE"); \ } while (0) @@ -51,6 +53,8 @@ These official OS versions are not implemented: #undef LIB_SPEC #define LIB_SPEC \ "%{pthread:-lpthread} \ +Index: b/src/gcc/config/arm/linux-eabi.h +=================================================================== --- a/src/gcc/config/arm/linux-eabi.h +++ b/src/gcc/config/arm/linux-eabi.h @@ -30,6 +30,15 @@ @@ -69,9 +73,11 @@ These official OS versions are not implemented: /* We default to a soft-float ABI so that binaries can run on all target hardware. If you override this to use the hard-float ABI then change the setting of GLIBC_DYNAMIC_LINKER_DEFAULT as well. */ +Index: b/src/gcc/config/darwin.h +=================================================================== --- a/src/gcc/config/darwin.h +++ b/src/gcc/config/darwin.h -@@ -921,4 +921,10 @@ extern void darwin_driver_init (unsigned +@@ -921,4 +921,10 @@ providing an osx-version-min of this unless overridden by the User. */ #define DEF_MIN_OSX_VERSION "10.4" @@ -82,9 +88,11 @@ These official OS versions are not implemented: + } while (0) + #endif /* CONFIG_DARWIN_H */ +Index: b/src/gcc/config/freebsd.h +=================================================================== --- a/src/gcc/config/freebsd.h +++ b/src/gcc/config/freebsd.h -@@ -32,6 +32,13 @@ along with GCC; see the file COPYING3. +@@ -32,6 +32,13 @@ #undef TARGET_OS_CPP_BUILTINS #define TARGET_OS_CPP_BUILTINS() FBSD_TARGET_OS_CPP_BUILTINS() @@ -98,9 +106,11 @@ These official OS versions are not implemented: #undef CPP_SPEC #define CPP_SPEC FBSD_CPP_SPEC +Index: b/src/gcc/config/gnu.h +=================================================================== --- a/src/gcc/config/gnu.h +++ b/src/gcc/config/gnu.h -@@ -39,3 +39,11 @@ along with GCC. If not, see <http://www +@@ -39,3 +39,11 @@ builtin_assert ("system=unix"); \ builtin_assert ("system=posix"); \ } while (0) @@ -112,9 +122,11 @@ These official OS versions are not implemented: + builtin_define ("Hurd"); \ + builtin_define ("Posix"); \ + } while (0) +Index: b/src/gcc/config/i386/cygwin.h +=================================================================== --- a/src/gcc/config/i386/cygwin.h +++ b/src/gcc/config/i386/cygwin.h -@@ -20,6 +20,13 @@ along with GCC; see the file COPYING3. +@@ -20,6 +20,13 @@ #define EXTRA_OS_CPP_BUILTINS() /* Nothing. */ @@ -128,9 +140,11 @@ These official OS versions are not implemented: #undef CPP_SPEC #define CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} \ -D__CYGWIN32__ -D__CYGWIN__ %{!ansi:-Dunix} -D__unix__ -D__unix \ +Index: b/src/gcc/config/i386/linux-common.h +=================================================================== --- a/src/gcc/config/i386/linux-common.h +++ b/src/gcc/config/i386/linux-common.h -@@ -27,6 +27,15 @@ along with GCC; see the file COPYING3. +@@ -27,6 +27,15 @@ } \ while (0) @@ -146,9 +160,11 @@ These official OS versions are not implemented: #undef CC1_SPEC #define CC1_SPEC \ LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC, \ +Index: b/src/gcc/config/i386/mingw32.h +=================================================================== --- a/src/gcc/config/i386/mingw32.h +++ b/src/gcc/config/i386/mingw32.h -@@ -53,6 +53,18 @@ along with GCC; see the file COPYING3. +@@ -53,6 +53,18 @@ } \ while (0) @@ -167,9 +183,11 @@ These official OS versions are not implemented: #ifndef TARGET_USE_PTHREAD_BY_DEFAULT #define SPEC_PTHREAD1 "pthread" #define SPEC_PTHREAD2 "!no-pthread" +Index: b/src/gcc/config/i386/mingw-w64.h +=================================================================== --- a/src/gcc/config/i386/mingw-w64.h +++ b/src/gcc/config/i386/mingw-w64.h -@@ -84,3 +84,10 @@ along with GCC; see the file COPYING3. +@@ -84,3 +84,10 @@ %{static:-Bstatic} %{!static:-Bdynamic} \ %{shared|mdll: " SUB_LINK_ENTRY " --enable-auto-image-base} \ %(shared_libgcc_undefs)" @@ -180,9 +198,11 @@ These official OS versions are not implemented: + TARGET_GENERIC_MINGW_OS_D_BUILTINS(); \ + builtin_define ("GNU_MinGW64"); \ + } while (0) +Index: b/src/gcc/config/kfreebsd-gnu.h +=================================================================== --- a/src/gcc/config/kfreebsd-gnu.h +++ b/src/gcc/config/kfreebsd-gnu.h -@@ -29,6 +29,14 @@ along with GCC; see the file COPYING3. +@@ -29,6 +29,14 @@ } \ while (0) @@ -197,9 +217,11 @@ These official OS versions are not implemented: #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER #define GNU_USER_DYNAMIC_LINKER32 GLIBC_DYNAMIC_LINKER32 #define GNU_USER_DYNAMIC_LINKER64 GLIBC_DYNAMIC_LINKER64 +Index: b/src/gcc/config/knetbsd-gnu.h +=================================================================== --- a/src/gcc/config/knetbsd-gnu.h +++ b/src/gcc/config/knetbsd-gnu.h -@@ -30,6 +30,16 @@ along with GCC; see the file COPYING3. +@@ -30,6 +30,16 @@ } \ while (0) @@ -216,9 +238,11 @@ These official OS versions are not implemented: #undef GNU_USER_DYNAMIC_LINKER #define GNU_USER_DYNAMIC_LINKER "/lib/ld.so.1" +Index: b/src/gcc/config/kopensolaris-gnu.h +=================================================================== --- a/src/gcc/config/kopensolaris-gnu.h +++ b/src/gcc/config/kopensolaris-gnu.h -@@ -30,5 +30,15 @@ along with GCC; see the file COPYING3. +@@ -30,5 +30,15 @@ } \ while (0) @@ -234,6 +258,8 @@ These official OS versions are not implemented: + #undef GNU_USER_DYNAMIC_LINKER #define GNU_USER_DYNAMIC_LINKER "/lib/ld.so.1" +Index: b/src/gcc/config/linux-android.h +=================================================================== --- a/src/gcc/config/linux-android.h +++ b/src/gcc/config/linux-android.h @@ -25,6 +25,12 @@ @@ -249,9 +275,11 @@ These official OS versions are not implemented: #if ANDROID_DEFAULT # define NOANDROID "mno-android" #else +Index: b/src/gcc/config/linux.h +=================================================================== --- a/src/gcc/config/linux.h +++ b/src/gcc/config/linux.h -@@ -49,6 +49,20 @@ see the files COPYING3 and COPYING.RUNTI +@@ -49,6 +49,20 @@ builtin_assert ("system=posix"); \ } while (0) @@ -272,9 +300,11 @@ These official OS versions are not implemented: /* Determine which dynamic linker to use depending on whether GLIBC or uClibc or Bionic is the default C library and whether -muclibc or -mglibc or -mbionic has been passed to change the default. */ +Index: b/src/gcc/config/mips/linux-common.h +=================================================================== --- a/src/gcc/config/mips/linux-common.h +++ b/src/gcc/config/mips/linux-common.h -@@ -27,6 +27,15 @@ along with GCC; see the file COPYING3. +@@ -27,6 +27,15 @@ ANDROID_TARGET_OS_CPP_BUILTINS(); \ } while (0) @@ -290,9 +320,11 @@ These official OS versions are not implemented: #undef LINK_SPEC #define LINK_SPEC \ LINUX_OR_ANDROID_LD (GNU_USER_TARGET_LINK_SPEC, \ +Index: b/src/gcc/config/netbsd.h +=================================================================== --- a/src/gcc/config/netbsd.h +++ b/src/gcc/config/netbsd.h -@@ -29,6 +29,14 @@ along with GCC; see the file COPYING3. +@@ -29,6 +29,14 @@ } \ while (0) @@ -307,9 +339,11 @@ These official OS versions are not implemented: /* CPP_SPEC parts common to all NetBSD targets. */ #define NETBSD_CPP_SPEC \ "%{posix:-D_POSIX_SOURCE} \ +Index: b/src/gcc/config/openbsd.h +=================================================================== --- a/src/gcc/config/openbsd.h +++ b/src/gcc/config/openbsd.h -@@ -84,6 +84,14 @@ along with GCC; see the file COPYING3. +@@ -84,6 +84,14 @@ } \ while (0) @@ -324,6 +358,8 @@ These official OS versions are not implemented: /* TARGET_OS_CPP_BUILTINS() common to all OpenBSD ELF targets. */ #define OPENBSD_OS_CPP_BUILTINS_ELF() \ do \ +Index: b/src/gcc/config/rs6000/aix.h +=================================================================== --- a/src/gcc/config/rs6000/aix.h +++ b/src/gcc/config/rs6000/aix.h @@ -110,6 +110,13 @@ @@ -340,9 +376,11 @@ These official OS versions are not implemented: /* Define appropriate architecture macros for preprocessor depending on target switches. */ +Index: b/src/gcc/config/rs6000/linux64.h +=================================================================== --- a/src/gcc/config/rs6000/linux64.h +++ b/src/gcc/config/rs6000/linux64.h -@@ -333,6 +333,17 @@ extern int dot_symbols; +@@ -323,6 +323,17 @@ } \ while (0) @@ -360,6 +398,8 @@ These official OS versions are not implemented: #undef CPP_OS_DEFAULT_SPEC #define CPP_OS_DEFAULT_SPEC "%(cpp_os_linux)" +Index: b/src/gcc/config/rs6000/linux.h +=================================================================== --- a/src/gcc/config/rs6000/linux.h +++ b/src/gcc/config/rs6000/linux.h @@ -52,6 +52,17 @@ diff --git a/debian/patches/go-use-gold.diff b/debian/patches/go-use-gold.diff index 040fd0b..8b56a81 100644 --- a/debian/patches/go-use-gold.diff +++ b/debian/patches/go-use-gold.diff @@ -110,7 +110,7 @@ Index: b/src/gcc/configure.ac =================================================================== --- a/src/gcc/configure.ac +++ b/src/gcc/configure.ac -@@ -2060,6 +2060,12 @@ +@@ -2059,6 +2059,12 @@ fi AC_MSG_RESULT($ld_is_gold) diff --git a/debian/patches/goarch-aarch64.diff b/debian/patches/goarch-aarch64.diff index a57dbed..bd2bdf1 100644 --- a/debian/patches/goarch-aarch64.diff +++ b/debian/patches/goarch-aarch64.diff @@ -1,16 +1,20 @@ # DP: Introduce aarch64 goarch. +Index: b/src/libgo/go/go/build/syslist.go +=================================================================== --- a/src/libgo/go/go/build/syslist.go -+++ a/src/libgo/go/go/build/syslist.go ++++ b/src/libgo/go/go/build/syslist.go @@ -5,4 +5,4 @@ package build const goosList = "darwin dragonfly freebsd linux netbsd openbsd plan9 windows solaris " -const goarchList = "386 amd64 arm alpha m68k mipso32 mipsn32 mipsn64 mipso64 ppc ppc64 sparc sparc64 " +const goarchList = "386 amd64 arm aarch64 alpha m68k mipso32 mipsn32 mipsn64 mipso64 ppc ppc64 sparc sparc64 " +Index: b/src/libgo/configure.ac +=================================================================== --- a/src/libgo/configure.ac -+++ a/src/libgo/configure.ac -@@ -172,6 +172,7 @@ ++++ b/src/libgo/configure.ac +@@ -169,6 +169,7 @@ dnl N.B. Keep in sync with gcc/testsuite/go.test/go-test.exp (go-set-goarch). is_386=no @@ -18,7 +22,7 @@ is_alpha=no is_arm=no is_m68k=no -@@ -183,6 +184,10 @@ +@@ -180,6 +181,10 @@ is_x86_64=no GOARCH=unknown case ${host} in @@ -29,7 +33,7 @@ alpha*-*-*) is_alpha=yes GOARCH=alpha -@@ -265,6 +270,7 @@ +@@ -262,6 +267,7 @@ ;; esac AM_CONDITIONAL(LIBGO_IS_386, test $is_386 = yes) @@ -37,9 +41,11 @@ AM_CONDITIONAL(LIBGO_IS_ALPHA, test $is_alpha = yes) AM_CONDITIONAL(LIBGO_IS_ARM, test $is_arm = yes) AM_CONDITIONAL(LIBGO_IS_M68K, test $is_m68k = yes) +Index: b/src/gcc/testsuite/go.test/go-test.exp +=================================================================== --- a/src/gcc/testsuite/go.test/go-test.exp -+++ a/src/gcc/testsuite/go.test/go-test.exp -@@ -187,6 +187,9 @@ ++++ b/src/gcc/testsuite/go.test/go-test.exp +@@ -172,6 +172,9 @@ global target_triplet switch -glob $target_triplet { diff --git a/debian/patches/libgo-testsuite.diff b/debian/patches/libgo-testsuite.diff index c2a9156..b98d07a 100644 --- a/debian/patches/libgo-testsuite.diff +++ b/debian/patches/libgo-testsuite.diff @@ -4,7 +4,7 @@ Index: b/src/libgo/Makefile.am =================================================================== --- a/src/libgo/Makefile.am +++ b/src/libgo/Makefile.am -@@ -2024,6 +2024,12 @@ +@@ -1958,6 +1958,12 @@ export LD_LIBRARY_PATH; \ $(MKDIR_P) $(@D); \ rm -f $@-testsum $@-testlog; \ @@ -17,7 +17,7 @@ Index: b/src/libgo/Makefile.am if test "$(USE_DEJAGNU)" = "yes"; then \ $(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --testname="$(@D)" --goarch="$(GOARCH)" $(GOTESTFLAGS) $(go_$(subst /,_,$(@D))_test_files); \ else \ -@@ -2037,6 +2043,7 @@ +@@ -1971,6 +1977,7 @@ echo "FAIL: $(@D)" > $@-testsum; \ exit 1; \ fi; \ @@ -29,7 +29,7 @@ Index: b/src/libgo/Makefile.in =================================================================== --- a/src/libgo/Makefile.in +++ b/src/libgo/Makefile.in -@@ -2131,6 +2131,12 @@ +@@ -2039,6 +2039,12 @@ export LD_LIBRARY_PATH; \ $(MKDIR_P) $(@D); \ rm -f $@-testsum $@-testlog; \ @@ -42,7 +42,7 @@ Index: b/src/libgo/Makefile.in if test "$(USE_DEJAGNU)" = "yes"; then \ $(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --testname="$(@D)" --goarch="$(GOARCH)" $(GOTESTFLAGS) $(go_$(subst /,_,$(@D))_test_files); \ else \ -@@ -2144,6 +2150,7 @@ +@@ -2052,6 +2058,7 @@ echo "FAIL: $(@D)" > $@-testsum; \ exit 1; \ fi; \ diff --git a/debian/patches/libstdc++-pic.diff b/debian/patches/libstdc++-pic.diff index f94cfbb..6af56b8 100644 --- a/debian/patches/libstdc++-pic.diff +++ b/debian/patches/libstdc++-pic.diff @@ -4,7 +4,7 @@ Index: b/src/libstdc++-v3/src/Makefile.am =================================================================== --- a/src/libstdc++-v3/src/Makefile.am +++ b/src/libstdc++-v3/src/Makefile.am -@@ -267,10 +267,12 @@ +@@ -273,10 +273,12 @@ STAMP_DEBUG = build-debug STAMP_INSTALL_DEBUG = install-debug CLEAN_DEBUG = debug @@ -17,7 +17,7 @@ Index: b/src/libstdc++-v3/src/Makefile.am endif # Build a debug variant. -@@ -305,6 +307,7 @@ +@@ -311,6 +313,7 @@ mv Makefile Makefile.tmp; \ sed -e 's,all-local: all-once,all-local:,' \ -e 's,install-data-local: install-data-once,install-data-local:,' \ @@ -25,7 +25,7 @@ Index: b/src/libstdc++-v3/src/Makefile.am -e '/vpath/!s,src/c,src/debug/c,' \ < Makefile.tmp > Makefile ; \ rm -f Makefile.tmp ; \ -@@ -315,3 +318,8 @@ +@@ -321,3 +324,8 @@ install-debug: build-debug (cd ${debugdir} && $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \ toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install) ; @@ -38,7 +38,7 @@ Index: b/src/libstdc++-v3/src/Makefile.in =================================================================== --- a/src/libstdc++-v3/src/Makefile.in +++ b/src/libstdc++-v3/src/Makefile.in -@@ -471,6 +471,8 @@ +@@ -472,6 +472,8 @@ @GLIBCXX_BUILD_DEBUG_TRUE@STAMP_INSTALL_DEBUG = install-debug @GLIBCXX_BUILD_DEBUG_FALSE@CLEAN_DEBUG = @GLIBCXX_BUILD_DEBUG_TRUE@CLEAN_DEBUG = debug @@ -47,7 +47,7 @@ Index: b/src/libstdc++-v3/src/Makefile.in # Build a debug variant. # Take care to fix all possibly-relative paths. -@@ -760,7 +762,7 @@ +@@ -761,7 +763,7 @@ install-dvi-am: @@ -56,7 +56,7 @@ Index: b/src/libstdc++-v3/src/Makefile.in install-html: install-html-recursive -@@ -811,11 +813,11 @@ +@@ -812,11 +814,11 @@ distclean-libtool distclean-tags dvi dvi-am html html-am info \ info-am install install-am install-data install-data-am \ install-data-local install-dvi install-dvi-am install-exec \ @@ -73,7 +73,7 @@ Index: b/src/libstdc++-v3/src/Makefile.in maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am \ -@@ -933,6 +935,7 @@ +@@ -939,6 +941,7 @@ mv Makefile Makefile.tmp; \ sed -e 's,all-local: all-once,all-local:,' \ -e 's,install-data-local: install-data-once,install-data-local:,' \ @@ -81,7 +81,7 @@ Index: b/src/libstdc++-v3/src/Makefile.in -e '/vpath/!s,src/c,src/debug/c,' \ < Makefile.tmp > Makefile ; \ rm -f Makefile.tmp ; \ -@@ -944,6 +947,11 @@ +@@ -950,6 +953,11 @@ (cd ${debugdir} && $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \ toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install) ; diff --git a/debian/patches/mips-fix-loongson2f-nop.diff b/debian/patches/mips-fix-loongson2f-nop.diff index a15ca38..047e617 100644 --- a/debian/patches/mips-fix-loongson2f-nop.diff +++ b/debian/patches/mips-fix-loongson2f-nop.diff @@ -5,7 +5,7 @@ Index: b/src/gcc/config/mips/mips.h =================================================================== --- a/src/gcc/config/mips/mips.h +++ b/src/gcc/config/mips/mips.h -@@ -1140,6 +1140,7 @@ +@@ -1188,6 +1188,7 @@ %{mshared} %{mno-shared} \ %{msym32} %{mno-sym32} \ %{mtune=*} \ diff --git a/debian/patches/pr49944.diff b/debian/patches/pr49944.diff index ad728da..be45017 100644 --- a/debian/patches/pr49944.diff +++ b/debian/patches/pr49944.diff @@ -52,7 +52,7 @@ Index: b/src/gcc/ada/s-osinte-kfreebsd-gnu.ads function To_Duration (TS : timespec) return Duration; pragma Inline (To_Duration); -@@ -271,6 +287,10 @@ +@@ -261,6 +277,10 @@ type pthread_key_t is private; PTHREAD_CREATE_DETACHED : constant := 1; @@ -63,7 +63,7 @@ Index: b/src/gcc/ada/s-osinte-kfreebsd-gnu.ads ----------- -- Stack -- -@@ -294,9 +314,29 @@ +@@ -284,9 +304,29 @@ Alternate_Stack_Size : constant := 0; -- No alternate signal stack is used on this platform @@ -94,7 +94,7 @@ Index: b/src/gcc/ada/s-osinte-kfreebsd-gnu.ads --------------------------------------- -- Nonstandard Thread Initialization -- -@@ -385,6 +425,36 @@ +@@ -375,6 +415,36 @@ -- POSIX.1c Section 13 -- -------------------------- @@ -131,7 +131,7 @@ Index: b/src/gcc/ada/s-osinte-kfreebsd-gnu.ads type struct_sched_param is record sched_priority : int; -- scheduling priority end record; -@@ -396,6 +466,28 @@ +@@ -386,6 +456,28 @@ param : access struct_sched_param) return int; pragma Import (C, pthread_setschedparam, "pthread_setschedparam"); @@ -160,7 +160,7 @@ Index: b/src/gcc/ada/s-osinte-kfreebsd-gnu.ads function pthread_attr_setschedpolicy (attr : access pthread_attr_t; policy : int) return int; -@@ -506,6 +598,9 @@ +@@ -496,6 +588,9 @@ end record; pragma Convention (C, timespec); diff --git a/debian/patches/pr57211.diff b/debian/patches/pr57211.diff index b9cfd8d..2d17310 100644 --- a/debian/patches/pr57211.diff +++ b/debian/patches/pr57211.diff @@ -13,9 +13,11 @@ PR c++/57211 * g++.dg/cpp0x/Wunused-parm.C: New. +Index: b/src/gcc/cp/method.c +=================================================================== --- a/src/gcc/cp/method.c +++ b/src/gcc/cp/method.c -@@ -1864,13 +1864,19 @@ defaultable_fn_check (tree fn) +@@ -1841,13 +1841,19 @@ } else { @@ -37,7 +39,9 @@ if (TYPE_BEING_DEFINED (DECL_CONTEXT (fn))) /* Defer checking. */; else if (!processing_template_decl) ---- a/src/gcc/testsuite/g++.dg/cpp0x/Wunused-parm.C +Index: b/src/gcc/testsuite/g++.dg/cpp0x/Wunused-parm.C +=================================================================== +--- /dev/null +++ b/src/gcc/testsuite/g++.dg/cpp0x/Wunused-parm.C @@ -0,0 +1,23 @@ +// PR c++/57211 diff --git a/debian/patches/sparc-force-cpu.diff b/debian/patches/sparc-force-cpu.diff index a63c11f..5ac08ea 100644 --- a/debian/patches/sparc-force-cpu.diff +++ b/debian/patches/sparc-force-cpu.diff @@ -4,7 +4,7 @@ Index: b/src/gcc/config.gcc =================================================================== --- a/src/gcc/config.gcc +++ b/src/gcc/config.gcc -@@ -3791,6 +3791,13 @@ +@@ -3816,6 +3816,13 @@ ;; esac diff --git a/debian/patches/sys-auxv-header.diff b/debian/patches/sys-auxv-header.diff index 481be6c..4f7b97f 100644 --- a/debian/patches/sys-auxv-header.diff +++ b/debian/patches/sys-auxv-header.diff @@ -1,8 +1,10 @@ # DP: Check for the sys/auxv.h header file. +Index: b/src/gcc/configure.ac +=================================================================== --- a/src/gcc/configure.ac +++ b/src/gcc/configure.ac -@@ -944,6 +944,7 @@ +@@ -942,6 +942,7 @@ AC_CHECK_HEADERS(limits.h stddef.h string.h strings.h stdlib.h time.h iconv.h \ fcntl.h unistd.h sys/file.h sys/time.h sys/mman.h \ sys/resource.h sys/param.h sys/times.h sys/stat.h \ @@ -10,9 +12,11 @@ direct.h malloc.h langinfo.h ldfcn.h locale.h wchar.h) # Check for thread headers. +Index: b/src/gcc/config.in +=================================================================== --- a/src/gcc/config.in +++ b/src/gcc/config.in -@@ -1446,6 +1440,12 @@ +@@ -1446,6 +1446,12 @@ #endif @@ -25,6 +29,8 @@ /* Define to 1 if you have the <sys/file.h> header file. */ #ifndef USED_FOR_TARGET #undef HAVE_SYS_FILE_H +Index: b/src/gcc/config/rs6000/driver-rs6000.c +=================================================================== --- a/src/gcc/config/rs6000/driver-rs6000.c +++ b/src/gcc/config/rs6000/driver-rs6000.c @@ -31,6 +31,10 @@ |