toolchain: bump GCC 11 to 11.3.0
Remove an upstreamed patch and rebase all remaining patches.
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
(cherry picked from commit f4cdef2191)
This commit is contained in:
parent
b6595dda4e
commit
608add17ac
@ -19,7 +19,7 @@ config GCC_VERSION
|
|||||||
default "7.5.0" if GCC_VERSION_7
|
default "7.5.0" if GCC_VERSION_7
|
||||||
default "9.3.0" if GCC_VERSION_9
|
default "9.3.0" if GCC_VERSION_9
|
||||||
default "10.3.0" if GCC_VERSION_10
|
default "10.3.0" if GCC_VERSION_10
|
||||||
default "11.2.0" if GCC_VERSION_11
|
default "11.3.0" if GCC_VERSION_11
|
||||||
default "8.4.0"
|
default "8.4.0"
|
||||||
|
|
||||||
config GCC_USE_IREMAP
|
config GCC_USE_IREMAP
|
||||||
|
|||||||
@ -44,8 +44,8 @@ ifeq ($(PKG_VERSION),10.3.0)
|
|||||||
PKG_HASH:=64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344
|
PKG_HASH:=64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(PKG_VERSION),11.2.0)
|
ifeq ($(PKG_VERSION),11.3.0)
|
||||||
PKG_HASH:=d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b
|
PKG_HASH:=b47cf2818691f5b1e21df2bb38c795fac2cfbd640ede2d0a5e1c89e338a3ac39
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PATCH_DIR=../patches/$(GCC_VERSION)
|
PATCH_DIR=../patches/$(GCC_VERSION)
|
||||||
|
|||||||
@ -12,7 +12,7 @@ Date: Tue Feb 26 16:16:33 2013 +0000
|
|||||||
|
|
||||||
--- a/gcc/Makefile.in
|
--- a/gcc/Makefile.in
|
||||||
+++ b/gcc/Makefile.in
|
+++ b/gcc/Makefile.in
|
||||||
@@ -3355,18 +3355,10 @@ doc/gcc.info: $(TEXI_GCC_FILES)
|
@@ -3348,18 +3348,10 @@ doc/gcc.info: $(TEXI_GCC_FILES)
|
||||||
doc/gccint.info: $(TEXI_GCCINT_FILES)
|
doc/gccint.info: $(TEXI_GCCINT_FILES)
|
||||||
doc/cppinternals.info: $(TEXI_CPPINT_FILES)
|
doc/cppinternals.info: $(TEXI_CPPINT_FILES)
|
||||||
|
|
||||||
@ -0,0 +1,46 @@
|
|||||||
|
From ea650cae26da4a8fc04f0c4666f4dd776d0b5fc0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
|
||||||
|
Date: Sun, 14 Nov 2021 21:54:25 -0800
|
||||||
|
Subject: [PATCH] configure: define TARGET_LIBC_GNUSTACK on musl
|
||||||
|
|
||||||
|
musl only uses PT_GNU_STACK to set default thread stack size and has no
|
||||||
|
executable stack support[0], so there is no reason not to emit the
|
||||||
|
.note.GNU-stack section on musl builds.
|
||||||
|
|
||||||
|
[0]: https://lore.kernel.org/all/20190423192534.GN23599@brightrain.aerifal.cx/T/#u
|
||||||
|
|
||||||
|
gcc/ChangeLog:
|
||||||
|
|
||||||
|
* configure: Regenerate.
|
||||||
|
* configure.ac: define TARGET_LIBC_GNUSTACK on musl
|
||||||
|
|
||||||
|
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
|
||||||
|
---
|
||||||
|
gcc/configure | 3 +++
|
||||||
|
gcc/configure.ac | 3 +++
|
||||||
|
2 files changed, 6 insertions(+)
|
||||||
|
|
||||||
|
--- a/gcc/configure
|
||||||
|
+++ b/gcc/configure
|
||||||
|
@@ -31533,6 +31533,9 @@ fi
|
||||||
|
# Check if the target LIBC handles PT_GNU_STACK.
|
||||||
|
gcc_cv_libc_gnustack=unknown
|
||||||
|
case "$target" in
|
||||||
|
+ mips*-*-linux-musl*)
|
||||||
|
+ gcc_cv_libc_gnustack=yes
|
||||||
|
+ ;;
|
||||||
|
mips*-*-linux*)
|
||||||
|
|
||||||
|
if test $glibc_version_major -gt 2 \
|
||||||
|
--- a/gcc/configure.ac
|
||||||
|
+++ b/gcc/configure.ac
|
||||||
|
@@ -7023,6 +7023,9 @@ fi
|
||||||
|
# Check if the target LIBC handles PT_GNU_STACK.
|
||||||
|
gcc_cv_libc_gnustack=unknown
|
||||||
|
case "$target" in
|
||||||
|
+ mips*-*-linux-musl*)
|
||||||
|
+ gcc_cv_libc_gnustack=yes
|
||||||
|
+ ;;
|
||||||
|
mips*-*-linux*)
|
||||||
|
GCC_GLIBC_VERSION_GTE_IFELSE([2], [31], [gcc_cv_libc_gnustack=yes], )
|
||||||
|
;;
|
||||||
@ -40,7 +40,7 @@ Date: Tue Jul 31 00:52:27 2007 +0000
|
|||||||
case OPT_fconstant_string_class_:
|
case OPT_fconstant_string_class_:
|
||||||
constant_string_class_name = arg;
|
constant_string_class_name = arg;
|
||||||
break;
|
break;
|
||||||
@@ -1196,6 +1205,47 @@ c_common_init (void)
|
@@ -1198,6 +1207,47 @@ c_common_init (void)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -114,7 +114,7 @@ Date: Tue Jul 31 00:52:27 2007 +0000
|
|||||||
; On SVR4 targets, it also controls whether or not to emit a
|
; On SVR4 targets, it also controls whether or not to emit a
|
||||||
--- a/gcc/doc/invoke.texi
|
--- a/gcc/doc/invoke.texi
|
||||||
+++ b/gcc/doc/invoke.texi
|
+++ b/gcc/doc/invoke.texi
|
||||||
@@ -9055,6 +9055,17 @@ This option is only supported for C and
|
@@ -9058,6 +9058,17 @@ This option is only supported for C and
|
||||||
@option{-Wall} and by @option{-Wpedantic}, which can be disabled with
|
@option{-Wall} and by @option{-Wpedantic}, which can be disabled with
|
||||||
@option{-Wno-pointer-sign}.
|
@option{-Wno-pointer-sign}.
|
||||||
|
|
||||||
@ -7,7 +7,7 @@ Date: Sat Apr 21 03:02:39 2012 +0000
|
|||||||
|
|
||||||
--- a/gcc/gcc.c
|
--- a/gcc/gcc.c
|
||||||
+++ b/gcc/gcc.c
|
+++ b/gcc/gcc.c
|
||||||
@@ -10100,8 +10100,10 @@ getenv_spec_function (int argc, const ch
|
@@ -10106,8 +10106,10 @@ getenv_spec_function (int argc, const ch
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!value)
|
if (!value)
|
||||||
@ -15,11 +15,9 @@ Date: Mon Aug 16 13:16:21 2021 +0100
|
|||||||
Reviewed-by: John Scipione <jscipione@gmail.com>
|
Reviewed-by: John Scipione <jscipione@gmail.com>
|
||||||
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
|
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
|
||||||
|
|
||||||
diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
|
|
||||||
index 976f9afae5..736b83ff0b 100644
|
|
||||||
--- a/gcc/config/aarch64/aarch64.h
|
--- a/gcc/config/aarch64/aarch64.h
|
||||||
+++ b/gcc/config/aarch64/aarch64.h
|
+++ b/gcc/config/aarch64/aarch64.h
|
||||||
@@ -1000,7 +1000,7 @@ extern const char *aarch64_rewrite_mcpu (int argc, const char **argv);
|
@@ -1236,7 +1236,7 @@ extern const char *aarch64_rewrite_mcpu
|
||||||
#define MCPU_TO_MARCH_SPEC_FUNCTIONS \
|
#define MCPU_TO_MARCH_SPEC_FUNCTIONS \
|
||||||
{ "rewrite_mcpu", aarch64_rewrite_mcpu },
|
{ "rewrite_mcpu", aarch64_rewrite_mcpu },
|
||||||
|
|
||||||
@ -28,8 +26,6 @@ index 976f9afae5..736b83ff0b 100644
|
|||||||
extern const char *host_detect_local_cpu (int argc, const char **argv);
|
extern const char *host_detect_local_cpu (int argc, const char **argv);
|
||||||
#define HAVE_LOCAL_CPU_DETECT
|
#define HAVE_LOCAL_CPU_DETECT
|
||||||
# define EXTRA_SPEC_FUNCTIONS \
|
# define EXTRA_SPEC_FUNCTIONS \
|
||||||
diff --git a/gcc/config/host-darwin.c b/gcc/config/host-darwin.c
|
|
||||||
index 8f700eec85..b737abc006 100644
|
|
||||||
--- a/gcc/config/host-darwin.c
|
--- a/gcc/config/host-darwin.c
|
||||||
+++ b/gcc/config/host-darwin.c
|
+++ b/gcc/config/host-darwin.c
|
||||||
@@ -22,6 +22,8 @@
|
@@ -22,6 +22,8 @@
|
||||||
@ -40,8 +36,8 @@ index 8f700eec85..b737abc006 100644
|
|||||||
+#include "hosthooks-def.h"
|
+#include "hosthooks-def.h"
|
||||||
|
|
||||||
/* Yes, this is really supposed to work. */
|
/* Yes, this is really supposed to work. */
|
||||||
static char pch_address_space[1024*1024*1024] __attribute__((aligned (4096)));
|
/* This allows for a pagesize of 16384, which we have on Darwin20, but should
|
||||||
@@ -75,3 +77,5 @@ darwin_gt_pch_use_address (void *addr, size_t sz, int fd, size_t off)
|
@@ -79,3 +81,5 @@ darwin_gt_pch_use_address (void *addr, s
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user