summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2014-09-10 10:31:14 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2014-12-12 08:15:34 +0100
commit6092f6b5c5d73db38258e4d2b14c83df3a62d264 (patch)
tree45541e7696fb47fb6ada93c4f443e43cc861c041
parentd159f126c4cc85781a9b13e02508169554a95be6 (diff)
downloadOSELAS.Toolchain-6092f6b5c5d73db38258e4d2b14c83df3a62d264.tar.gz
cross-gcc: update patches 4.8.2 -> 4.9.2
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/gcc-4.8.2/0100-Backport-fix-for-PR-target-58854.patch31
-rw-r--r--patches/gcc-4.8.2/0202-libgcc-reorder-tmake_file-for-arm-uclinux.patch30
-rw-r--r--patches/gcc-4.8.2/0303-libmudflap-susv3-legacy.patch62
-rw-r--r--patches/gcc-4.9.2/0200-no-host-includes.patch (renamed from patches/gcc-4.8.2/0200-no-host-includes.patch)2
-rw-r--r--patches/gcc-4.9.2/0201-gcc-i386-use-pure64-CLFS-patch.patch (renamed from patches/gcc-4.8.2/0201-gcc-i386-use-pure64-CLFS-patch.patch)4
-rw-r--r--patches/gcc-4.9.2/0300-also-match-uclibc-when-checking-host-os.patch (renamed from patches/gcc-4.8.2/0300-also-match-uclibc-when-checking-host-os.patch)4
-rw-r--r--patches/gcc-4.9.2/0301-missing-execinfo.h.patch (renamed from patches/gcc-4.8.2/0301-missing-execinfo.h.patch)2
-rw-r--r--patches/gcc-4.9.2/0302-c99-snprintf.patch (renamed from patches/gcc-4.8.2/0302-c99-snprintf.patch)4
-rw-r--r--patches/gcc-4.9.2/0400-libiberty-pic.patch (renamed from patches/gcc-4.8.2/0400-libiberty-pic.patch)2
-rw-r--r--patches/gcc-4.9.2/0401-libstdc-pic.patch (renamed from patches/gcc-4.8.2/0401-libstdc-pic.patch)12
-rw-r--r--patches/gcc-4.9.2/0500-Fix-Argument-list-too-long-error.patch (renamed from patches/gcc-4.8.2/0500-Fix-Argument-list-too-long-error.patch)4
-rw-r--r--patches/gcc-4.9.2/series (renamed from patches/gcc-4.8.2/series)5
l---------patches/gcc-linaro-4.8-2013.111
13 files changed, 18 insertions, 145 deletions
diff --git a/patches/gcc-4.8.2/0100-Backport-fix-for-PR-target-58854.patch b/patches/gcc-4.8.2/0100-Backport-fix-for-PR-target-58854.patch
deleted file mode 100644
index 2fa986c..0000000
--- a/patches/gcc-4.8.2/0100-Backport-fix-for-PR-target-58854.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: ramana <ramana@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Mon, 11 Nov 2013 09:38:14 +0000
-Subject: [PATCH] Backport fix for PR target/58854
-
-2013-11-11 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
-
- Backported from mainline
- 2013-10-30 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
-
- PR target/58854
- * config/arm/arm.c (arm_expand_epilogue_apcs_frame): Emit blockage
-
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch@204665 138bc75d-0d04-0410-961f-82ee72b054a4
----
- gcc/config/arm/arm.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
-index d787a6e..52871f1 100644
---- a/gcc/config/arm/arm.c
-+++ b/gcc/config/arm/arm.c
-@@ -23555,6 +23555,7 @@ arm_expand_epilogue_apcs_frame (bool really_return)
- num_regs = bit_count (saved_regs_mask);
- if ((offsets->outgoing_args != (1 + num_regs)) || cfun->calls_alloca)
- {
-+ emit_insn (gen_blockage ());
- /* Unwind the stack to just below the saved registers. */
- emit_insn (gen_addsi3 (stack_pointer_rtx,
- hard_frame_pointer_rtx,
diff --git a/patches/gcc-4.8.2/0202-libgcc-reorder-tmake_file-for-arm-uclinux.patch b/patches/gcc-4.8.2/0202-libgcc-reorder-tmake_file-for-arm-uclinux.patch
deleted file mode 100644
index 98da02c..0000000
--- a/patches/gcc-4.8.2/0202-libgcc-reorder-tmake_file-for-arm-uclinux.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 5 Dec 2012 17:17:52 +0100
-Subject: [PATCH] libgcc: reorder $tmake_file for arm*-*-uclinux*
-
-arm/t-arm must be first in the list. It overwrites variables instead of
-appending, so anything set before is lost.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- libgcc/config.host | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libgcc/config.host b/libgcc/config.host
-index 259c9a7..8ce8396 100644
---- a/libgcc/config.host
-+++ b/libgcc/config.host
-@@ -330,11 +330,11 @@ arm*-*-linux*) # ARM GNU/Linux with ELF
- tmake_file="$tmake_file t-softfp-sfdf t-softfp-excl arm/t-softfp t-softfp"
- ;;
- arm*-*-uclinux*) # ARM ucLinux
-- tmake_file="${tmake_file} t-fixedpoint-gnu-prefix"
-+ tmake_file="${tmake_file} arm/t-arm t-fixedpoint-gnu-prefix"
- tmake_file="${tmake_file} arm/t-bpabi"
- tm_file="$tm_file arm/bpabi-lib.h"
- unwind_header=config/arm/unwind-arm.h
-- tmake_file="$tmake_file arm/t-arm arm/t-elf t-softfp-sfdf t-softfp-excl arm/t-softfp t-softfp"
-+ tmake_file="$tmake_file arm/t-elf t-softfp-sfdf t-softfp-excl arm/t-softfp t-softfp"
- extra_parts="$extra_parts crti.o crtn.o"
- ;;
- arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems*)
diff --git a/patches/gcc-4.8.2/0303-libmudflap-susv3-legacy.patch b/patches/gcc-4.8.2/0303-libmudflap-susv3-legacy.patch
deleted file mode 100644
index 3b44263..0000000
--- a/patches/gcc-4.8.2/0303-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Date: Tue, 1 Nov 2011 18:25:07 +0100
-Subject: [PATCH] libmudflap susv3 legacy
-
-uclibc does not provide bzero, bcopy, index ...
-
-This patch was taken from uclibc.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
----
- libmudflap/mf-hooks2.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/libmudflap/mf-hooks2.c b/libmudflap/mf-hooks2.c
-index 4af17df..a3c6b2f 100644
---- a/libmudflap/mf-hooks2.c
-+++ b/libmudflap/mf-hooks2.c
-@@ -424,7 +424,7 @@ WRAPPER2(void, bzero, void *s, size_t n)
- {
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
-- bzero (s, n);
-+ memset (s, 0, n);
- }
-
-
-@@ -434,7 +434,7 @@ WRAPPER2(void, bcopy, const void *src, void *dest, size_t n)
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
- MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
-- bcopy (src, dest, n);
-+ memmove (dest, src, n);
- }
-
-
-@@ -444,7 +444,7 @@ WRAPPER2(int, bcmp, const void *s1, const void *s2, size_t n)
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
- MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
-- return bcmp (s1, s2, n);
-+ return n == 0 ? 0 : memcmp (s1, s2, n);
- }
-
-
-@@ -453,7 +453,7 @@ WRAPPER2(char *, index, const char *s, int c)
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
-- return index (s, c);
-+ return strchr (s, c);
- }
-
-
-@@ -462,7 +462,7 @@ WRAPPER2(char *, rindex, const char *s, int c)
- size_t n = strlen (s);
- TRACE ("%s\n", __PRETTY_FUNCTION__);
- MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
-- return rindex (s, c);
-+ return strrchr (s, c);
- }
-
- /* XXX: stpcpy, memccpy */
diff --git a/patches/gcc-4.8.2/0200-no-host-includes.patch b/patches/gcc-4.9.2/0200-no-host-includes.patch
index 7764414..91006f5 100644
--- a/patches/gcc-4.8.2/0200-no-host-includes.patch
+++ b/patches/gcc-4.9.2/0200-no-host-includes.patch
@@ -15,7 +15,7 @@ Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
1 file changed, 28 insertions(+)
diff --git a/gcc/incpath.c b/gcc/incpath.c
-index 018da98..d0442bd 100644
+index f495c0a7fc0c..d3fb24a525c8 100644
--- a/gcc/incpath.c
+++ b/gcc/incpath.c
@@ -450,6 +450,34 @@ add_path (char *path, int chain, int cxx_aware, bool user_supplied_p)
diff --git a/patches/gcc-4.8.2/0201-gcc-i386-use-pure64-CLFS-patch.patch b/patches/gcc-4.9.2/0201-gcc-i386-use-pure64-CLFS-patch.patch
index a6cec86..8699d7c 100644
--- a/patches/gcc-4.8.2/0201-gcc-i386-use-pure64-CLFS-patch.patch
+++ b/patches/gcc-4.9.2/0201-gcc-i386-use-pure64-CLFS-patch.patch
@@ -18,7 +18,7 @@ Signed-off-by: Andreas BieƟmann <andreas@biessmann.de>
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
-index b793e08..da88da9 100644
+index a90171e8c540..24c7c9489421 100644
--- a/gcc/config/i386/linux64.h
+++ b/gcc/config/i386/linux64.h
@@ -27,6 +27,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
@@ -31,7 +31,7 @@ index b793e08..da88da9 100644
+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
-index bcea0c6..3fbec37 100644
+index 5ec8907a9343..7b83beec7fd1 100644
--- a/gcc/config/i386/t-linux64
+++ b/gcc/config/i386/t-linux64
@@ -33,6 +33,6 @@
diff --git a/patches/gcc-4.8.2/0300-also-match-uclibc-when-checking-host-os.patch b/patches/gcc-4.9.2/0300-also-match-uclibc-when-checking-host-os.patch
index 0ec4d1d..c18364b 100644
--- a/patches/gcc-4.8.2/0300-also-match-uclibc-when-checking-host-os.patch
+++ b/patches/gcc-4.9.2/0300-also-match-uclibc-when-checking-host-os.patch
@@ -11,7 +11,7 @@ Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/contrib/regression/objs-gcc.sh b/contrib/regression/objs-gcc.sh
-index 60b0497..6dc7ead 100755
+index 60b0497fea24..6dc7eadff360 100755
--- a/contrib/regression/objs-gcc.sh
+++ b/contrib/regression/objs-gcc.sh
@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-gnu ]
@@ -26,7 +26,7 @@ index 60b0497..6dc7ead 100755
make bootstrap || exit 1
make install || exit 1
diff --git a/libjava/classpath/ltconfig b/libjava/classpath/ltconfig
-index 743d951..ae4ea60 100755
+index 743d95135fb8..ae4ea6095cdd 100755
--- a/libjava/classpath/ltconfig
+++ b/libjava/classpath/ltconfig
@@ -603,7 +603,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
diff --git a/patches/gcc-4.8.2/0301-missing-execinfo.h.patch b/patches/gcc-4.9.2/0301-missing-execinfo.h.patch
index 1af399c..0bafc7c 100644
--- a/patches/gcc-4.8.2/0301-missing-execinfo.h.patch
+++ b/patches/gcc-4.9.2/0301-missing-execinfo.h.patch
@@ -10,7 +10,7 @@ Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/boehm-gc/include/gc.h b/boehm-gc/include/gc.h
-index c51e017..a7ba8dc 100644
+index c51e017d6748..a7ba8dca1a62 100644
--- a/boehm-gc/include/gc.h
+++ b/boehm-gc/include/gc.h
@@ -503,7 +503,7 @@ GC_API GC_PTR GC_malloc_atomic_ignore_off_page GC_PROTO((size_t lb));
diff --git a/patches/gcc-4.8.2/0302-c99-snprintf.patch b/patches/gcc-4.9.2/0302-c99-snprintf.patch
index 891a394..0258f31 100644
--- a/patches/gcc-4.8.2/0302-c99-snprintf.patch
+++ b/patches/gcc-4.9.2/0302-c99-snprintf.patch
@@ -10,10 +10,10 @@ Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libstdc++-v3/include/c_global/cstdio b/libstdc++-v3/include/c_global/cstdio
-index fcbec0c..adb2bfb 100644
+index 6043b3de2bf3..54772bccc0c9 100644
--- a/libstdc++-v3/include/c_global/cstdio
+++ b/libstdc++-v3/include/c_global/cstdio
-@@ -138,7 +138,7 @@ namespace std
+@@ -146,7 +146,7 @@ namespace std
using ::vsprintf;
} // namespace
diff --git a/patches/gcc-4.8.2/0400-libiberty-pic.patch b/patches/gcc-4.9.2/0400-libiberty-pic.patch
index 4f7a900..872295e 100644
--- a/patches/gcc-4.8.2/0400-libiberty-pic.patch
+++ b/patches/gcc-4.9.2/0400-libiberty-pic.patch
@@ -11,7 +11,7 @@ Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
1 file changed, 1 insertion(+)
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
-index f6a3ebd..01ae1a7 100644
+index 75ff82d984a9..a55137e5f1de 100644
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -250,6 +250,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
diff --git a/patches/gcc-4.8.2/0401-libstdc-pic.patch b/patches/gcc-4.9.2/0401-libstdc-pic.patch
index 4b2a2fe..aa90fa9 100644
--- a/patches/gcc-4.8.2/0401-libstdc-pic.patch
+++ b/patches/gcc-4.9.2/0401-libstdc-pic.patch
@@ -12,13 +12,13 @@ Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
-index 092fd1b..ff5988f 100644
+index 6c2d228f844d..a77072802d4f 100644
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
-@@ -182,6 +182,13 @@ CXXLINK = \
+@@ -187,6 +187,13 @@ CXXLINK = \
+ $(VTV_CXXLINKFLAGS) \
$(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
-
+install-exec-local:
+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
+ if [ x"$$pic_objs" != x ]; then \
@@ -30,10 +30,10 @@ index 092fd1b..ff5988f 100644
if ENABLE_SYMVERS
libstdc++-symbols.ver: ${glibcxx_srcdir}/$(SYMVER_FILE) \
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
-index a7b3404..d8d93b9 100644
+index cd3943b1afc8..b49f2aedb1b9 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
-@@ -761,7 +761,7 @@ install-dvi: install-dvi-recursive
+@@ -769,7 +769,7 @@ install-dvi: install-dvi-recursive
install-dvi-am:
@@ -42,7 +42,7 @@ index a7b3404..d8d93b9 100644
install-html: install-html-recursive
-@@ -950,6 +950,13 @@ install-debug: build-debug
+@@ -963,6 +963,13 @@ install-debug: build-debug
(cd ${debugdir} && $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \
toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install) ;
diff --git a/patches/gcc-4.8.2/0500-Fix-Argument-list-too-long-error.patch b/patches/gcc-4.9.2/0500-Fix-Argument-list-too-long-error.patch
index a534fde..e434b45 100644
--- a/patches/gcc-4.8.2/0500-Fix-Argument-list-too-long-error.patch
+++ b/patches/gcc-4.9.2/0500-Fix-Argument-list-too-long-error.patch
@@ -23,10 +23,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
-index aad927c..63aee76 100644
+index b47733cef501..13cd6944b67c 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
-@@ -4627,7 +4627,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype
+@@ -3160,7 +3160,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype
# We keep the directory structure for files in config or c-family and .def
# files. All other files are flattened to a single directory.
$(mkinstalldirs) $(DESTDIR)$(plugin_includedir)
diff --git a/patches/gcc-4.8.2/series b/patches/gcc-4.9.2/series
index e4f1274..5278778 100644
--- a/patches/gcc-4.8.2/series
+++ b/patches/gcc-4.9.2/series
@@ -1,19 +1,16 @@
# generated by git-ptx-patches
#tag:base
#tag:Upstream --start-number 100
-0100-Backport-fix-for-PR-target-58854.patch
#tag:OSELAS.toolchain --start-number 200
0200-no-host-includes.patch
0201-gcc-i386-use-pure64-CLFS-patch.patch
-0202-libgcc-reorder-tmake_file-for-arm-uclinux.patch
#tag:uclibc --start-number 300
0300-also-match-uclibc-when-checking-host-os.patch
0301-missing-execinfo.h.patch
0302-c99-snprintf.patch
-0303-libmudflap-susv3-legacy.patch
#tag:gentoo --start-number 400
0400-libiberty-pic.patch
0401-libstdc-pic.patch
#tag:OpenEmbedded --start-number 500
0500-Fix-Argument-list-too-long-error.patch
-# 770f638e8c16c7df912e1f26ec0a549a - git-ptx-patches magic
+# c671ca1334def5681f59a78c91610f8c - git-ptx-patches magic
diff --git a/patches/gcc-linaro-4.8-2013.11 b/patches/gcc-linaro-4.8-2013.11
deleted file mode 120000
index 82eb636..0000000
--- a/patches/gcc-linaro-4.8-2013.11
+++ /dev/null
@@ -1 +0,0 @@
-gcc-4.8.2 \ No newline at end of file