summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2020-05-04 13:14:03 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2020-05-08 11:34:00 +0200
commitd8b057ddc713265cd66b632b7992cb61363aaecc (patch)
treeeb4d11b09239f4f5c6b18391fc3090b83b2f7eaa /patches
parent51ef9fe67a4cd39358f34d62a148aaeee7f865e6 (diff)
downloadOSELAS.Toolchain-d8b057ddc713265cd66b632b7992cb61363aaecc.tar.gz
OSELAS.Toolchain-d8b057ddc713265cd66b632b7992cb61363aaecc.tar.xz
cross-gcc: version bump 9-20191130 -> 10-20200502
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/gcc-10-20200502/0200-gcc-i386-use-pure64-CLFS-patch.patch (renamed from patches/gcc-9-20191130/0201-gcc-i386-use-pure64-CLFS-patch.patch)4
-rw-r--r--patches/gcc-10-20200502/0201-aarch64-change-paths-for-pure64.patch (renamed from patches/gcc-9-20191130/0202-aarch64-change-paths-for-pure64.patch)2
-rw-r--r--patches/gcc-10-20200502/0300-libstdc-pic.patch (renamed from patches/gcc-9-20191130/0401-libstdc-pic.patch)8
-rw-r--r--patches/gcc-10-20200502/series9
-rw-r--r--patches/gcc-9-20191130/0200-no-host-includes.patch55
-rw-r--r--patches/gcc-9-20191130/0300-also-match-uclibc-when-checking-host-os.patch26
-rw-r--r--patches/gcc-9-20191130/0400-libiberty-pic.patch24
-rw-r--r--patches/gcc-9-20191130/series13
8 files changed, 16 insertions, 125 deletions
diff --git a/patches/gcc-9-20191130/0201-gcc-i386-use-pure64-CLFS-patch.patch b/patches/gcc-10-20200502/0200-gcc-i386-use-pure64-CLFS-patch.patch
index 75a70c0..225dc34 100644
--- a/patches/gcc-9-20191130/0201-gcc-i386-use-pure64-CLFS-patch.patch
+++ b/patches/gcc-10-20200502/0200-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 c08221c42105..6197e9eaaafe 100644
+index 6cb68d1ccfa1..1b170fa56e63 100644
--- a/gcc/config/i386/linux64.h
+++ b/gcc/config/i386/linux64.h
@@ -27,8 +27,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
@@ -33,7 +33,7 @@ index c08221c42105..6197e9eaaafe 100644
#undef MUSL_DYNAMIC_LINKER32
diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
-index c686ab2f0d26..5439c47cc455 100644
+index 1171e218578e..4936e51ede60 100644
--- a/gcc/config/i386/t-linux64
+++ b/gcc/config/i386/t-linux64
@@ -33,6 +33,6 @@
diff --git a/patches/gcc-9-20191130/0202-aarch64-change-paths-for-pure64.patch b/patches/gcc-10-20200502/0201-aarch64-change-paths-for-pure64.patch
index 1bea2cf..09b7ebc 100644
--- a/patches/gcc-9-20191130/0202-aarch64-change-paths-for-pure64.patch
+++ b/patches/gcc-10-20200502/0201-aarch64-change-paths-for-pure64.patch
@@ -10,7 +10,7 @@ Signed-off-by: Michael Tretter <michael.tretter@posteo.net>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
-index 5ad670ba2cea..dfeedf149992 100644
+index 83e59e33b85e..a7dab7fe1573 100644
--- a/gcc/config/aarch64/t-aarch64-linux
+++ b/gcc/config/aarch64/t-aarch64-linux
@@ -22,7 +22,7 @@ LIB1ASMSRC = aarch64/lib1funcs.asm
diff --git a/patches/gcc-9-20191130/0401-libstdc-pic.patch b/patches/gcc-10-20200502/0300-libstdc-pic.patch
index d45291a..39cd056 100644
--- a/patches/gcc-9-20191130/0401-libstdc-pic.patch
+++ b/patches/gcc-10-20200502/0300-libstdc-pic.patch
@@ -12,7 +12,7 @@ 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 8511a3049c53..b4255eae2f1e 100644
+index a139adc81b35..829fc56b1637 100644
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -224,6 +224,13 @@ CXXLINK = \
@@ -30,10 +30,10 @@ index 8511a3049c53..b4255eae2f1e 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 d91f71589859..93089c53bc12 100644
+index ea37a962a9a5..2e50582adfe4 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
-@@ -885,7 +885,7 @@ install-dvi: install-dvi-recursive
+@@ -886,7 +886,7 @@ install-dvi: install-dvi-recursive
install-dvi-am:
@@ -42,7 +42,7 @@ index d91f71589859..93089c53bc12 100644
install-html: install-html-recursive
-@@ -1086,6 +1086,13 @@ install-debug: build-debug
+@@ -1087,6 +1087,13 @@ install-debug: build-debug
(cd ${debugdir} && $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \
toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install) ;
diff --git a/patches/gcc-10-20200502/series b/patches/gcc-10-20200502/series
new file mode 100644
index 0000000..0dda7c4
--- /dev/null
+++ b/patches/gcc-10-20200502/series
@@ -0,0 +1,9 @@
+# generated by git-ptx-patches
+#tag:base
+#tag:Upstream --start-number 100
+#tag:OSELAS.toolchain --start-number 200
+0200-gcc-i386-use-pure64-CLFS-patch.patch
+0201-aarch64-change-paths-for-pure64.patch
+#tag:gentoo --start-number 300
+0300-libstdc-pic.patch
+# 7b9b1dffc2b0fd6adb97f59f65bf8172 - git-ptx-patches magic
diff --git a/patches/gcc-9-20191130/0200-no-host-includes.patch b/patches/gcc-9-20191130/0200-no-host-includes.patch
deleted file mode 100644
index 326c81a..0000000
--- a/patches/gcc-9-20191130/0200-no-host-includes.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Marc Kleine-Budde <m.kleine-budde@pengutronix.de>
-Date: Tue, 1 Nov 2011 18:25:06 +0100
-Subject: [PATCH] no host includes
-
-With this patch gcc bails out if you include a host include path into
-the searchlist (-I). This patch is not intended for upstream and was
-inspired by
-
-http://www.openembedded.org/repo/org.openembedded.dev/packages/gcc/gcc-4.1.1/zecke-no-host-includes.patch
-
-Signed-off-by: Marc Kleine-Budde <m.kleine-budde@pengutronix.de>
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
----
- gcc/incpath.c | 28 ++++++++++++++++++++++++++++
- 1 file changed, 28 insertions(+)
-
-diff --git a/gcc/incpath.c b/gcc/incpath.c
-index bcbe20829051..9003b7e27c3f 100644
---- a/gcc/incpath.c
-+++ b/gcc/incpath.c
-@@ -461,6 +461,34 @@ add_path (char *path, incpath_kind chain, int cxx_aware, bool user_supplied_p)
- p->construct = 0;
- p->user_supplied_p = user_supplied_p;
-
-+#ifdef CROSS_COMPILE
-+ /* A common error when cross compiling is including
-+ host headers. This code below will try to fail fast
-+ for cross compiling. Currently we consider /usr/include,
-+ /opt/include and /sw/include as harmful. */
-+ {
-+ unsigned int i;
-+ const char *bad_path[] = {
-+ "/usr/include",
-+ "/usr/local/include",
-+ "/sw/include",
-+ "/opt/include",
-+ };
-+
-+ for (i = 0; i < sizeof(bad_path)/sizeof(bad_path[0]); i++) {
-+ if( strstr(p->name, bad_path[i]) == p->name ) {
-+ fprintf(stderr,_("\n"
-+ "CROSS COMPILE Badness: %s in INCLUDEPATH: %s\n"
-+ "\n"),
-+
-+ bad_path[i], p->name);
-+
-+ exit (FATAL_EXIT_CODE);
-+ }
-+ }
-+ }
-+#endif
-+
- add_cpp_dir_path (p, chain);
- }
-
diff --git a/patches/gcc-9-20191130/0300-also-match-uclibc-when-checking-host-os.patch b/patches/gcc-9-20191130/0300-also-match-uclibc-when-checking-host-os.patch
deleted file mode 100644
index e5d01a6..0000000
--- a/patches/gcc-9-20191130/0300-also-match-uclibc-when-checking-host-os.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Date: Tue, 1 Nov 2011 18:25:07 +0100
-Subject: [PATCH] also match uclibc when checking host os
-
-This patch was taken from uclibc.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
----
- contrib/regression/objs-gcc.sh | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/contrib/regression/objs-gcc.sh b/contrib/regression/objs-gcc.sh
-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 ]
- then
- make all-gdb all-dejagnu all-ld || exit 1
- make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+ make all-gdb all-dejagnu all-ld || exit 1
-+ make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
- make bootstrap || exit 1
- make install || exit 1
diff --git a/patches/gcc-9-20191130/0400-libiberty-pic.patch b/patches/gcc-9-20191130/0400-libiberty-pic.patch
deleted file mode 100644
index b7fe9f1..0000000
--- a/patches/gcc-9-20191130/0400-libiberty-pic.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Marc Kleine-Budde <m.kleine-budde@pengutronix.de>
-Date: Tue, 1 Nov 2011 18:25:08 +0100
-Subject: [PATCH] libiberty pic
-
-Taken from gentoo.
-
-Signed-off-by: Marc Kleine-Budde <m.kleine-budde@pengutronix.de>
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
----
- libiberty/Makefile.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
-index 0be45b4ae8ec..8ed5a1147b7c 100644
---- a/libiberty/Makefile.in
-+++ b/libiberty/Makefile.in
-@@ -261,6 +261,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
- $(AR) $(AR_FLAGS) $(TARGETLIB) \
- $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- $(RANLIB) $(TARGETLIB); \
-+ cp $(TARGETLIB) ../ ; \
- cd ..; \
- else true; fi
-
diff --git a/patches/gcc-9-20191130/series b/patches/gcc-9-20191130/series
deleted file mode 100644
index 8ab3a47..0000000
--- a/patches/gcc-9-20191130/series
+++ /dev/null
@@ -1,13 +0,0 @@
-# generated by git-ptx-patches
-#tag:base
-#tag:Upstream --start-number 100
-#tag:OSELAS.toolchain --start-number 200
-0200-no-host-includes.patch
-0201-gcc-i386-use-pure64-CLFS-patch.patch
-0202-aarch64-change-paths-for-pure64.patch
-#tag:uclibc --start-number 300
-0300-also-match-uclibc-when-checking-host-os.patch
-#tag:gentoo --start-number 400
-0400-libiberty-pic.patch
-0401-libstdc-pic.patch
-# 9f6feaac654748e56638aee7db92fa0e - git-ptx-patches magic