gcc: rebase patches on top of gcc 11.4
PATCH 1/2 gcc: rebase patches on top of gcc 11.4
From: Etienne Cordonnier <[email protected]>
poky kirkstone 4.0.12 updates gcc from 11.3 to 11.4, thus the patches need to be rebased.
- The changes of 0001-libstdcxx-Rename-null-terminated-to-avoid-collision.patch are in 11.4 so it can be removed.
- upstream introduced DARWIN_MIN_LIB_VERSION instead of the hard-coded 10.4, so assign this variable the value 12.3
- use include path of gcc 11.4.0
Signed-off-by Etienne Cordonnier <[email protected]>
--- .../clang/0037-Fixes_for_Darwin_SDKs.patch | 4 +- ...e-null-terminated-to-avoid-collision.patch | 81 ------------------- ...00-change-macosx-version-min-to-12.3.patch | 29 +++---- recipes-devtools/gcc/gcc-source_%.bbappend | 1 - 4 files changed, 11 insertions(+), 104 deletions(-) delete mode 100644 recipes-devtools/gcc/files/0001-libstdcxx-Rename-null-terminated-to-avoid-collision.patch
recipes-devtools/clang/clang/0037-Fixes_for_Darwin_SDKs.patch +2 -2
@@ -22,13 +22,13 @@ index f7da3f187814..0656f5cbad69 100644 - "4.2.1", - "i686-apple-darwin10", - arch == llvm::Triple::x86_64 ? "x86_64" : ""); -+ "11.3.0", ++ "11.4.0", + "x86_64#SDK_VENDOR#-darwin21", + ""); IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx, - "4.0.0", "i686-apple-darwin8", - ""); -+ "11.3.0", "", ""); ++ "11.4.0", "", ""); + { + const char *S = ::getenv("YOCTO_SDKPATH"); + if (S && (S[0] != '\0')) {
recipes-devtools/gcc/files/0001-libstdcxx-Rename-null-terminated-to-avoid-collision.patch deleted +0 -81
81 lines not on this page · raw message
recipes-devtools/gcc/files/0100-change-macosx-version-min-to-12.3.patch +9 -20
@@ -1,4 +1,4 @@ -From 07ee0f0eb8442174b2e5d39862bd99952c2cfb64 Mon Sep 17 00:00:00 2001 +From 8f7f5820b24f57460e26440e770c8407ec11e10d Mon Sep 17 00:00:00 2001 From: Etienne Cordonnier <[email protected]> Date: Thu, 11 Aug 2022 15:39:44 +0200 Subject: [PATCH] change macosx-version-min to 12.3
@@ -6,33 +6,22 @@ Subject: [PATCH] change macosx-version-min to 12.3 Upstream-Status: Inappropriate [OE specific] Signed-off-by: Etienne Cordonnier <[email protected]> --- - libgcc/config/t-darwin | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + libgcc/config/t-darwin | 3 +++ + 1 file changed, 3 insertions(+) diff --git a/libgcc/config/t-darwin b/libgcc/config/t-darwin -index 299d26c2c96..c7117023277 100644 +index a3bb70c6a0a..8923a375c68 100644 --- a/libgcc/config/t-darwin +++ b/libgcc/config/t-darwin -@@ -1,15 +1,15 @@ +@@ -1,5 +1,8 @@ # Set this as a minimum (unless overriden by arch t-files) since it's a # reasonable lowest common denominator that works for all our archs. --HOST_LIBGCC2_CFLAGS += -mmacosx-version-min=10.4 -+HOST_LIBGCC2_CFLAGS += -mmacosx-version-min=12.3 ++DARWIN_MIN_CRT_VERSION="-mmacosx-version-min=12.3" ++DARWIN_MIN_LIB_VERSION="-mmacosx-version-min=12.3" ++ + HOST_LIBGCC2_CFLAGS += $(DARWIN_MIN_LIB_VERSION) crt3.o: $(srcdir)/config/darwin-crt3.c -- $(crt_compile) -mmacosx-version-min=10.4 -c $< -+ $(crt_compile) -mmacosx-version-min=12.3 -c $< - - crttms.o: $(srcdir)/config/darwin-crt-tm.c -- $(crt_compile) -mmacosx-version-min=10.4 -DSTART -c $< -+ $(crt_compile) -mmacosx-version-min=12.3 -DSTART -c $< - - crttme.o: $(srcdir)/config/darwin-crt-tm.c -- $(crt_compile) -mmacosx-version-min=10.4 -DEND -c $< -+ $(crt_compile) -mmacosx-version-min=12.3 -DEND -c $< - - # Make emutls weak so that we can deal with -static-libgcc, override the - # hidden visibility when this is present in libgcc_eh. -- 2.36.1.vfs.0.0
recipes-devtools/gcc/gcc-source_%.bbappend +0 -1
@@ -4,5 +4,4 @@ SRC_URI:append = "\ file://0099-nativesdk-gcc-darwin.patch \ file://0100-change-macosx-version-min-to-12.3.patch \ file://0101-optional-libstdc.patch \ - file://0001-libstdcxx-Rename-null-terminated-to-avoid-collision.patch \ "
Signature · 1 line
2.36.1.vfs.0.0
PATCH 2/2 gcc: re-add zstd dependency
From: Etienne Cordonnier <[email protected]>
The zstd cross-compile build for darwin was fixed in f786ea1379a64fbbd, thus there is no need to remove this dependency any more.
Signed-off-by Etienne Cordonnier <[email protected]>
--- recipes-devtools/gcc/gcc-cross-canadian_%.bbappend | 5 ----- 1 file changed, 5 deletions(-)
recipes-devtools/gcc/gcc-cross-canadian_%.bbappend +0 -5
@@ -12,8 +12,3 @@ EXTRA_OECONF:remove:darwinsdk = "--enable-clocale=generic" # Remove -rpath-link and -rpath LDFLAGS:darwinsdk = "${BUILDSDK_LDFLAGS}" - -# zstd uses uname to determine the compiler's target and makes the assumption that the host OS is the target, -# so it does not support Darwin as a cross-compiler target. -# zstd is not really needed as a dependency of gcc, and zstd would need to be fixed to compile for Darwin -DEPENDS:remove = "nativesdk-zstd"
Signature · 1 line
2.36.1.vfs.0.0