From patchwork Sat May 27 02:21:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 24599 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 176DFC77B7C for ; Sat, 27 May 2023 02:21:28 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web10.3759.1685154079406964559 for ; Fri, 26 May 2023 19:21:19 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=J0pLF4yb; spf=pass (domain: gmail.com, ip: 209.85.210.170, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-64d3491609fso1208443b3a.3 for ; Fri, 26 May 2023 19:21:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685154078; x=1687746078; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=3KkFajO34JUYTs9/yeJmWsz3k/q4KGcRWnEr59cKOy4=; b=J0pLF4ybrKwf1Vhpt0+tay3D4xULsej8FP3k9ZAqXY3q4LSLejWO1w3enavUArhqN8 5HU2pysqQo+l80B5u/8DdTdbKoI4JHhozyFf5q+LfA7GtwrueXXLmdszzRboKEXv1v/C IBVn27JeZYshMyzLu1oByJEB/QfHYgiAQKVsLCal9Rrzc64o4lbftlgY5BucmCR/SYMl /hlN6REoUkIYTRIbS57FjXey+ac/pUVLZrjv83CsmcOe8jdWnOdPLpBb9FcrG+391MFJ LfzygDSROofQ4mHZ6SqPgdSK06VpxhKCYDjf060euwct0TjX5lUgQjgr69YZVKMcr4tn lMNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685154078; x=1687746078; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=3KkFajO34JUYTs9/yeJmWsz3k/q4KGcRWnEr59cKOy4=; b=Ly9xInOIckpeOpEI2p5fNRWrQDFpxRU1Nlgq/DLLQ5k6oYWJwW/lbP4Dnz4RrY72WF rvpwJly02HoI3x1I/ZjTefm74wtCTmFb93ylhpkEeSmgudKbZiPcRa00NziVthraN1yQ ksoC1bLDBvMigwgAnO+nSvVPJH6dWeNkUl4RKiiyxuplDXELhJH8IRFspU0O/AC0QZk2 XvdR4cFTKO8bDCSo6G/aEQUit0G7xWA5QshPu9NaWm/b4JN+lpioTuTxXXN1volU1+tF 62J0hLG1JX5Qa5EhdlOwkxv0oig4QhlDIWe1XHwUvEzt19l4fLygbMPWTlksfo8C42n1 jiig== X-Gm-Message-State: AC+VfDwsSPK8Kd3ts917azBc6eNqS2uNkvLA+ZoYSjbRTWPzyt83CF5G 8GK0TkR/ALmaZi/Nj9mEa6gXvM7Xe68= X-Google-Smtp-Source: ACHHUZ53S5IUkqhZgLmfU+eZ3d4EcxNbLOdCxuZidwnRefmrqsdP94E43EXcaPVtEnE+bmAT8mi6CQ== X-Received: by 2002:a05:6a00:10d0:b0:645:ac97:5295 with SMTP id d16-20020a056a0010d000b00645ac975295mr5863767pfu.9.1685154078161; Fri, 26 May 2023 19:21:18 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:d380::c4c0]) by smtp.gmail.com with ESMTPSA id m9-20020aa78a09000000b00639fc7124c2sm3351043pfa.148.2023.05.26.19.21.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 19:21:17 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj , Martin Jansa Subject: [PATCH] gcc: Upgrade to 13.1.1 Date: Fri, 26 May 2023 19:21:15 -0700 Message-Id: <20230527022115.143341-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 27 May 2023 02:21:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181786 Some distros e.g. gentoo have latest on gcc-13 branch and we have a situation where libstdc++ ABI is changed between 13.1 and 13.2 so official 13.1 release based uninative will no longer work on these distros, therefore switch to a snapshot that includes [1] which fixes it [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108969 Reported-by: Martin Jansa Signed-off-by: Khem Raj Cc: Martin Jansa Tested-by: Martin Jansa --- meta/conf/distro/include/maintainers.inc | 2 +- meta/recipes-devtools/gcc/gcc-13.1.inc | 18 +++--- ...AMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 64 ++++--------------- 3 files changed, 24 insertions(+), 60 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 619fe073810..359a29c0768 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -188,7 +188,7 @@ RECIPE_MAINTAINER:pn-gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj gcc/config/sparc/linux64.h | 4 ++-- 18 files changed, 53 insertions(+), 58 deletions(-) -diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h -index 4277f03da2a..e4c92c03291 100644 --- a/gcc/config/aarch64/aarch64-linux.h +++ b/gcc/config/aarch64/aarch64-linux.h @@ -21,10 +21,10 @@ @@ -52,11 +50,9 @@ index 4277f03da2a..e4c92c03291 100644 #undef ASAN_CC1_SPEC #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" -diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h -index 03f783f2ad1..4fa02668aa7 100644 --- a/gcc/config/alpha/linux-elf.h +++ b/gcc/config/alpha/linux-elf.h -@@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. If not see +@@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. #define EXTRA_SPECS \ { "elf_dynamic_linker", ELF_DYNAMIC_LINKER }, @@ -67,8 +63,6 @@ index 03f783f2ad1..4fa02668aa7 100644 #if DEFAULT_LIBC == LIBC_UCLIBC #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" #elif DEFAULT_LIBC == LIBC_GLIBC -diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h -index a119875599d..dce7f59eeea 100644 --- a/gcc/config/arm/linux-eabi.h +++ b/gcc/config/arm/linux-eabi.h @@ -62,8 +62,8 @@ @@ -91,8 +85,6 @@ index a119875599d..dce7f59eeea 100644 /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to use the GNU/Linux version, not the generic BPABI version. */ -diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h -index 7b7b7cbbe14..98ef2267117 100644 --- a/gcc/config/arm/linux-elf.h +++ b/gcc/config/arm/linux-elf.h @@ -60,7 +60,7 @@ @@ -104,11 +96,9 @@ index 7b7b7cbbe14..98ef2267117 100644 #define LINUX_TARGET_LINK_SPEC "%{h*} \ %{static:-Bstatic} \ -diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h -index bbb7cc7115e..7d9272040ee 100644 --- a/gcc/config/i386/linux.h +++ b/gcc/config/i386/linux.h -@@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. If not see +@@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. . */ #define GNU_USER_LINK_EMULATION "elf_i386" @@ -118,11 +108,9 @@ index bbb7cc7115e..7d9272040ee 100644 #undef MUSL_DYNAMIC_LINKER -#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" +#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-i386.so.1" -diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h -index 2bd9f48e271..dbbe7ca5440 100644 --- a/gcc/config/i386/linux64.h +++ b/gcc/config/i386/linux64.h -@@ -27,13 +27,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +@@ -27,13 +27,13 @@ see the files COPYING3 and COPYING.RUNTI #define GNU_USER_LINK_EMULATION64 "elf_x86_64" #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" @@ -142,11 +130,9 @@ index 2bd9f48e271..dbbe7ca5440 100644 #undef MUSL_DYNAMIC_LINKERX32 -#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" +#define MUSL_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-musl-x32.so.1" -diff --git a/gcc/config/linux.h b/gcc/config/linux.h -index e3aca79cccc..6491c6b84f5 100644 --- a/gcc/config/linux.h +++ b/gcc/config/linux.h -@@ -86,10 +86,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +@@ -86,10 +86,10 @@ see the files COPYING3 and COPYING.RUNTI GLIBC_DYNAMIC_LINKER must be defined for each target using them, or GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets supporting both 32-bit and 64-bit compilation. */ @@ -161,11 +147,9 @@ index e3aca79cccc..6491c6b84f5 100644 #define BIONIC_DYNAMIC_LINKER "/system/bin/linker" #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" -diff --git a/gcc/config/loongarch/gnu-user.h b/gcc/config/loongarch/gnu-user.h -index aecaa02a199..62f88f7f9a2 100644 --- a/gcc/config/loongarch/gnu-user.h +++ b/gcc/config/loongarch/gnu-user.h -@@ -31,11 +31,11 @@ along with GCC; see the file COPYING3. If not see +@@ -31,11 +31,11 @@ along with GCC; see the file COPYING3. #undef GLIBC_DYNAMIC_LINKER #define GLIBC_DYNAMIC_LINKER \ @@ -179,8 +163,6 @@ index aecaa02a199..62f88f7f9a2 100644 #undef GNU_USER_TARGET_LINK_SPEC #define GNU_USER_TARGET_LINK_SPEC \ -diff --git a/gcc/config/microblaze/linux.h b/gcc/config/microblaze/linux.h -index e2e2c421c52..6f26480e3b5 100644 --- a/gcc/config/microblaze/linux.h +++ b/gcc/config/microblaze/linux.h @@ -28,7 +28,7 @@ @@ -201,11 +183,9 @@ index e2e2c421c52..6f26480e3b5 100644 #undef SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS \ -diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h -index 5add34ea134..34692b433b8 100644 --- a/gcc/config/mips/linux.h +++ b/gcc/config/mips/linux.h -@@ -22,29 +22,29 @@ along with GCC; see the file COPYING3. If not see +@@ -22,29 +22,29 @@ along with GCC; see the file COPYING3. #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32" #define GLIBC_DYNAMIC_LINKER32 \ @@ -244,8 +224,6 @@ index 5add34ea134..34692b433b8 100644 #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" #define GNU_USER_DYNAMIC_LINKERN32 \ -diff --git a/gcc/config/nios2/linux.h b/gcc/config/nios2/linux.h -index 2ce097ebbce..1d45d7b4962 100644 --- a/gcc/config/nios2/linux.h +++ b/gcc/config/nios2/linux.h @@ -29,10 +29,10 @@ @@ -261,11 +239,9 @@ index 2ce097ebbce..1d45d7b4962 100644 #undef LINK_SPEC #define LINK_SPEC LINK_SPEC_ENDIAN \ -diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h -index b9557a75dc7..e10ca1f97e7 100644 --- a/gcc/config/riscv/linux.h +++ b/gcc/config/riscv/linux.h -@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see +@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. GNU_USER_TARGET_OS_CPP_BUILTINS(); \ } while (0) @@ -274,17 +250,15 @@ index b9557a75dc7..e10ca1f97e7 100644 #define MUSL_ABI_SUFFIX \ "%{mabi=ilp32:-sf}" \ -@@ -33,7 +33,7 @@ along with GCC; see the file COPYING3. If not see +@@ -33,7 +33,7 @@ along with GCC; see the file COPYING3. "%{mabi=lp64d:}" #undef MUSL_DYNAMIC_LINKER -#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-riscv" XLEN_SPEC MUSL_ABI_SUFFIX ".so.1" +#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-riscv" XLEN_SPEC MUSL_ABI_SUFFIX ".so.1" - /* Because RISC-V only has word-sized atomics, it requries libatomic where - others do not. So link libatomic by default, as needed. */ -diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h -index 9e457033d11..2ddab7c99c1 100644 + #define ICACHE_FLUSH_FUNC "__riscv_flush_icache" + --- a/gcc/config/rs6000/linux64.h +++ b/gcc/config/rs6000/linux64.h @@ -339,24 +339,19 @@ extern int dot_symbols; @@ -317,8 +291,6 @@ index 9e457033d11..2ddab7c99c1 100644 #undef DEFAULT_ASM_ENDIAN #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) -diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h -index ae932fc22f0..26db003cb3a 100644 --- a/gcc/config/rs6000/sysv4.h +++ b/gcc/config/rs6000/sysv4.h @@ -771,10 +771,10 @@ GNU_USER_TARGET_CC1_SPEC @@ -334,11 +306,9 @@ index ae932fc22f0..26db003cb3a 100644 #ifndef GNU_USER_DYNAMIC_LINKER #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER -diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h -index 02aa1edaff8..fab268d61f4 100644 --- a/gcc/config/s390/linux.h +++ b/gcc/config/s390/linux.h -@@ -72,13 +72,13 @@ along with GCC; see the file COPYING3. If not see +@@ -72,13 +72,13 @@ along with GCC; see the file COPYING3. #define MULTILIB_DEFAULTS { "m31" } #endif @@ -356,11 +326,9 @@ index 02aa1edaff8..fab268d61f4 100644 #undef LINK_SPEC #define LINK_SPEC \ -diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h -index 29f5902b98b..83d1e53e6e2 100644 --- a/gcc/config/sh/linux.h +++ b/gcc/config/sh/linux.h -@@ -61,10 +61,10 @@ along with GCC; see the file COPYING3. If not see +@@ -61,10 +61,10 @@ along with GCC; see the file COPYING3. #undef MUSL_DYNAMIC_LINKER #define MUSL_DYNAMIC_LINKER \ @@ -373,11 +341,9 @@ index 29f5902b98b..83d1e53e6e2 100644 #undef SUBTARGET_LINK_EMUL_SUFFIX #define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}" -diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h -index 0e33b3cac2c..84f29adbb35 100644 --- a/gcc/config/sparc/linux.h +++ b/gcc/config/sparc/linux.h -@@ -78,7 +78,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); +@@ -78,7 +78,7 @@ extern const char *host_detect_local_cpu When the -shared link option is used a final link is not being done. */ @@ -386,11 +352,9 @@ index 0e33b3cac2c..84f29adbb35 100644 #undef LINK_SPEC #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ -diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h -index f1cc0a19e49..94bc2032803 100644 --- a/gcc/config/sparc/linux64.h +++ b/gcc/config/sparc/linux64.h -@@ -78,8 +78,8 @@ along with GCC; see the file COPYING3. If not see +@@ -78,8 +78,8 @@ along with GCC; see the file COPYING3. When the -shared link option is used a final link is not being done. */