* [PATCH 1/4] gcc: Merge three related patches together
@ 2021-10-26 11:11 Richard Purdie
2021-10-26 11:11 ` [PATCH 2/4] gcc: Drop sdt (dtrace) header patch Richard Purdie
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Richard Purdie @ 2021-10-26 11:11 UTC (permalink / raw)
To: openembedded-core
The SYSTEMLIBS_DIR change was spread over three patches, merge these
together since there is no value in having them separate.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-devtools/gcc/gcc-11.2.inc | 2 -
...AMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 52 ++++++++++---------
...IR-replacement-instead-of-hardcoding.patch | 26 ----------
...22-aarch64-Add-support-for-musl-ldso.patch | 25 ---------
4 files changed, 28 insertions(+), 77 deletions(-)
delete mode 100644 meta/recipes-devtools/gcc/gcc/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
delete mode 100644 meta/recipes-devtools/gcc/gcc/0022-aarch64-Add-support-for-musl-ldso.patch
diff --git a/meta/recipes-devtools/gcc/gcc-11.2.inc b/meta/recipes-devtools/gcc/gcc-11.2.inc
index 9fd30f52a88..6fa344e9612 100644
--- a/meta/recipes-devtools/gcc/gcc-11.2.inc
+++ b/meta/recipes-devtools/gcc/gcc-11.2.inc
@@ -50,8 +50,6 @@ SRC_URI = "\
file://0018-export-CPP.patch \
file://0019-Ensure-target-gcc-headers-can-be-included.patch \
file://0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch \
- file://0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \
- file://0022-aarch64-Add-support-for-musl-ldso.patch \
file://0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch \
file://0024-handle-sysroot-support-for-nativesdk-gcc.patch \
file://0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch \
diff --git a/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
index 4726267a80f..0884730786c 100644
--- a/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
+++ b/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
@@ -30,8 +30,7 @@ Upstream-Status: Inappropriate [OE configuration]
gcc/config/sparc/linux64.h | 4 ++--
12 files changed, 29 insertions(+), 34 deletions(-)
-diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
-index c1dae8ca2cf..3ce2b76c1a4 100644
+unchanged:
--- 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
@@ -45,8 +44,7 @@ index c1dae8ca2cf..3ce2b76c1a4 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 85d0136e76e..6bd95855827 100644
+unchanged:
--- a/gcc/config/arm/linux-eabi.h
+++ b/gcc/config/arm/linux-eabi.h
@@ -65,8 +65,8 @@
@@ -60,8 +58,7 @@ index 85d0136e76e..6bd95855827 100644
#define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT
#define GLIBC_DYNAMIC_LINKER \
-diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
-index 0c1c4e70b6b..6bd643ade11 100644
+unchanged:
--- a/gcc/config/arm/linux-elf.h
+++ b/gcc/config/arm/linux-elf.h
@@ -60,7 +60,7 @@
@@ -73,8 +70,7 @@ index 0c1c4e70b6b..6bd643ade11 100644
#define LINUX_TARGET_LINK_SPEC "%{h*} \
%{static:-Bstatic} \
-diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
-index 04b274f1654..7aafcf3ac2d 100644
+unchanged:
--- 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
@@ -86,8 +82,7 @@ index 04b274f1654..7aafcf3ac2d 100644
#undef MUSL_DYNAMIC_LINKER
#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
-diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
-index b3822ced528..92d303e80d6 100644
+unchanged:
--- a/gcc/config/i386/linux64.h
+++ b/gcc/config/i386/linux64.h
@@ -27,9 +27,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
@@ -103,8 +98,7 @@ index b3822ced528..92d303e80d6 100644
#undef MUSL_DYNAMIC_LINKER32
#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
-diff --git a/gcc/config/linux.h b/gcc/config/linux.h
-index 4e1db60fced..87efc5f69fe 100644
+unchanged:
--- a/gcc/config/linux.h
+++ b/gcc/config/linux.h
@@ -94,10 +94,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
@@ -122,8 +116,7 @@ index 4e1db60fced..87efc5f69fe 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/mips/linux.h b/gcc/config/mips/linux.h
-index 44a85e410d9..8d41b5574f6 100644
+unchanged:
--- a/gcc/config/mips/linux.h
+++ b/gcc/config/mips/linux.h
@@ -22,20 +22,20 @@ along with GCC; see the file COPYING3. If not see
@@ -153,8 +146,7 @@ index 44a85e410d9..8d41b5574f6 100644
#undef MUSL_DYNAMIC_LINKER32
#define MUSL_DYNAMIC_LINKER32 \
-diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index 9238de5bc92..7136a83260a 100644
+unchanged:
--- 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
@@ -166,8 +158,7 @@ index 9238de5bc92..7136a83260a 100644
#define MUSL_ABI_SUFFIX \
"%{mabi=ilp32:-sf}" \
-diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
-index e3f2cd254f6..a11e01faa3d 100644
+unchanged:
--- a/gcc/config/rs6000/linux64.h
+++ b/gcc/config/rs6000/linux64.h
@@ -336,24 +336,19 @@ extern int dot_symbols;
@@ -200,8 +191,7 @@ index e3f2cd254f6..a11e01faa3d 100644
#undef DEFAULT_ASM_ENDIAN
#if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
-diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h
-index 7558d2f7195..3aaa6c3a078 100644
+unchanged:
--- a/gcc/config/sh/linux.h
+++ b/gcc/config/sh/linux.h
@@ -64,7 +64,7 @@ along with GCC; see the file COPYING3. If not see
@@ -213,8 +203,7 @@ index 7558d2f7195..3aaa6c3a078 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 2550d7ee8f0..a94f4cd8ba2 100644
+unchanged:
--- 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);
@@ -226,8 +215,7 @@ index 2550d7ee8f0..a94f4cd8ba2 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 95af8afa9b5..63127afb074 100644
+unchanged:
--- 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
@@ -241,3 +229,19 @@ index 95af8afa9b5..63127afb074 100644
#ifdef SPARC_BI_ARCH
+diff -u b/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
+--- b/gcc/config/aarch64/aarch64-linux.h
++++ b/gcc/config/aarch64/aarch64-linux.h
+@@ -21,10 +21,10 @@
+ #ifndef GCC_AARCH64_LINUX_H
+ #define GCC_AARCH64_LINUX_H
+
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
+
+ #undef MUSL_DYNAMIC_LINKER
+-#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
++#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
+
+ #undef ASAN_CC1_SPEC
+ #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}"
diff --git a/meta/recipes-devtools/gcc/gcc/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch b/meta/recipes-devtools/gcc/gcc/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
deleted file mode 100644
index 0f3b3869b02..00000000000
--- a/meta/recipes-devtools/gcc/gcc/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7faad21154a76b200efcced9e12945057c94dff3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 28 Apr 2015 23:15:27 -0700
-Subject: [PATCH] Use SYSTEMLIBS_DIR replacement instead of hardcoding
- base_libdir
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- gcc/config/aarch64/aarch64-linux.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
-index 7f2529a2a1d..5303b39186f 100644
---- a/gcc/config/aarch64/aarch64-linux.h
-+++ b/gcc/config/aarch64/aarch64-linux.h
-@@ -21,7 +21,7 @@
- #ifndef GCC_AARCH64_LINUX_H
- #define GCC_AARCH64_LINUX_H
-
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
-+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
-
- #undef MUSL_DYNAMIC_LINKER
- #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
diff --git a/meta/recipes-devtools/gcc/gcc/0022-aarch64-Add-support-for-musl-ldso.patch b/meta/recipes-devtools/gcc/gcc/0022-aarch64-Add-support-for-musl-ldso.patch
deleted file mode 100644
index 41536a8a3b4..00000000000
--- a/meta/recipes-devtools/gcc/gcc/0022-aarch64-Add-support-for-musl-ldso.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 96aa24a874331a318693e4fccc4bc4e7d3fbad2b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 28 Apr 2015 23:18:39 -0700
-Subject: [PATCH] aarch64: Add support for musl ldso
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- gcc/config/aarch64/aarch64-linux.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
-index 5303b39186f..4bcae7f3110 100644
---- a/gcc/config/aarch64/aarch64-linux.h
-+++ b/gcc/config/aarch64/aarch64-linux.h
-@@ -24,7 +24,7 @@
- #define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
-
- #undef MUSL_DYNAMIC_LINKER
--#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
-+#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
-
- #undef ASAN_CC1_SPEC
- #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}"
--
2.32.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/4] gcc: Drop sdt (dtrace) header patch
2021-10-26 11:11 [PATCH 1/4] gcc: Merge three related patches together Richard Purdie
@ 2021-10-26 11:11 ` Richard Purdie
2021-10-26 15:52 ` [OE-core] " Khem Raj
2021-10-26 11:11 ` [PATCH 3/4] gcc: Fix nolibstdc++ patch Richard Purdie
` (3 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Richard Purdie @ 2021-10-26 11:11 UTC (permalink / raw)
To: openembedded-core
Since we now have recipe specific sysroots we no longer need this patch
to avoid the dtrace headers affecting the build of gcc-runtime. Drop
the patch.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-devtools/gcc/gcc-11.2.inc | 1 -
.../gcc/gcc/0013-Disable-sdt.patch | 110 ------------------
2 files changed, 111 deletions(-)
delete mode 100644 meta/recipes-devtools/gcc/gcc/0013-Disable-sdt.patch
diff --git a/meta/recipes-devtools/gcc/gcc-11.2.inc b/meta/recipes-devtools/gcc/gcc-11.2.inc
index 6fa344e9612..1ab779533ca 100644
--- a/meta/recipes-devtools/gcc/gcc-11.2.inc
+++ b/meta/recipes-devtools/gcc/gcc-11.2.inc
@@ -42,7 +42,6 @@ SRC_URI = "\
file://0010-MIPS64-Default-to-N64-ABI.patch \
file://0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch \
file://0012-gcc-Fix-argument-list-too-long-error.patch \
- file://0013-Disable-sdt.patch \
file://0014-libtool.patch \
file://0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \
file://0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch \
diff --git a/meta/recipes-devtools/gcc/gcc/0013-Disable-sdt.patch b/meta/recipes-devtools/gcc/gcc/0013-Disable-sdt.patch
deleted file mode 100644
index 1e657666df9..00000000000
--- a/meta/recipes-devtools/gcc/gcc/0013-Disable-sdt.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 7928a4eddc4a6d821a6aa6eaaea1fd60d54e3da9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 29 Mar 2013 09:28:10 +0400
-Subject: [PATCH] Disable sdt.
-
-We don't list dtrace in DEPENDS so we shouldn't be depending on this header.
-It may or may not exist from preivous builds though. To be determinstic, disable
-sdt.h usage always. This avoids build failures if the header is removed after configure
-but before libgcc is compiled for example.
-
-RP 2012/8/7
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Disable sdt for libstdc++-v3.
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-
-Upstream-Status: Inappropriate [hack]
----
- gcc/configure | 12 ++++++------
- gcc/configure.ac | 18 +++++++++---------
- libstdc++-v3/configure | 6 +++---
- libstdc++-v3/configure.ac | 2 +-
- 4 files changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/gcc/configure b/gcc/configure
-index c5d3bc4ee2d..5160917d73e 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -30812,12 +30812,12 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5
- $as_echo_n "checking sys/sdt.h in the target C library... " >&6; }
- have_sys_sdt_h=no
--if test -f $target_header_dir/sys/sdt.h; then
-- have_sys_sdt_h=yes
--
--$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
--
--fi
-+#if test -f $target_header_dir/sys/sdt.h; then
-+# have_sys_sdt_h=yes
-+#
-+#$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
-+#
-+#fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5
- $as_echo "$have_sys_sdt_h" >&6; }
-
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index f83420326d6..50f78308e8a 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -6653,15 +6653,15 @@ fi
- AC_SUBST([enable_default_ssp])
-
- # Test for <sys/sdt.h> on the target.
--GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H])
--AC_MSG_CHECKING(sys/sdt.h in the target C library)
--have_sys_sdt_h=no
--if test -f $target_header_dir/sys/sdt.h; then
-- have_sys_sdt_h=yes
-- AC_DEFINE(HAVE_SYS_SDT_H, 1,
-- [Define if your target C library provides sys/sdt.h])
--fi
--AC_MSG_RESULT($have_sys_sdt_h)
-+#GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H])
-+#AC_MSG_CHECKING(sys/sdt.h in the target C library)
-+#have_sys_sdt_h=no
-+#if test -f $target_header_dir/sys/sdt.h; then
-+# have_sys_sdt_h=yes
-+# AC_DEFINE(HAVE_SYS_SDT_H, 1,
-+# [Define if your target C library provides sys/sdt.h])
-+#fi
-+#AC_MSG_RESULT($have_sys_sdt_h)
-
- # Check if TFmode long double should be used by default or not.
- # Some glibc targets used DFmode long double, but with glibc 2.4
-diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
-index a310e9feb6c..c879445b8a6 100755
---- a/libstdc++-v3/configure
-+++ b/libstdc++-v3/configure
-@@ -22014,11 +22014,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-- if test $glibcxx_cv_sys_sdt_h = yes; then
-+# if test $glibcxx_cv_sys_sdt_h = yes; then
-
--$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
-+#$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
-
-- fi
-+# fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_sys_sdt_h" >&5
- $as_echo "$glibcxx_cv_sys_sdt_h" >&6; }
-
-diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
-index 3c799be82b1..3f63a8ec9ce 100644
---- a/libstdc++-v3/configure.ac
-+++ b/libstdc++-v3/configure.ac
-@@ -240,7 +240,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN
- GLIBCXX_CHECK_SC_NPROC_ONLN
- GLIBCXX_CHECK_PTHREADS_NUM_PROCESSORS_NP
- GLIBCXX_CHECK_SYSCTL_HW_NCPU
--GLIBCXX_CHECK_SDT_H
-+#GLIBCXX_CHECK_SDT_H
-
- # Check for available headers.
- AC_CHECK_HEADERS([endian.h execinfo.h float.h fp.h ieeefp.h inttypes.h \
--
2.32.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/4] gcc: Fix nolibstdc++ patch
2021-10-26 11:11 [PATCH 1/4] gcc: Merge three related patches together Richard Purdie
2021-10-26 11:11 ` [PATCH 2/4] gcc: Drop sdt (dtrace) header patch Richard Purdie
@ 2021-10-26 11:11 ` Richard Purdie
2021-10-26 15:51 ` [OE-core] " Khem Raj
2021-10-26 11:11 ` [PATCH 4/4] gcc: Drop broken/unneeded patch Richard Purdie
` (2 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Richard Purdie @ 2021-10-26 11:11 UTC (permalink / raw)
To: openembedded-core
Somewhere along the line the docs patch was corrupted with incorrect
changes. Strip these out and clean up the patch.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../gcc/gcc/0005-optional-libstdc.patch | 28 ++-----------------
1 file changed, 2 insertions(+), 26 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc/0005-optional-libstdc.patch b/meta/recipes-devtools/gcc/gcc/0005-optional-libstdc.patch
index c921ac3340c..c64fbf6a976 100644
--- a/meta/recipes-devtools/gcc/gcc/0005-optional-libstdc.patch
+++ b/meta/recipes-devtools/gcc/gcc/0005-optional-libstdc.patch
@@ -55,12 +55,10 @@ diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 6659a903bf0..9ee63dbe52f 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
-@@ -239,6 +239,9 @@ in the following sections.
+@@ -239,6 +239,7 @@ in the following sections.
-fno-weak -nostdinc++ @gol
-fvisibility-inlines-hidden @gol
-fvisibility-ms-compat @gol
-+-fvtable-verify=@r{[}std@r{|}preinit@r{|}none@r{]} @gol
-+-fvtv-counts -fvtv-debug @gol
+-nostdlib++ @gol
-fext-numeric-literals @gol
-flang-info-include-translate@r{[}=@var{header}@r{]} @gol
@@ -74,7 +72,7 @@ index 6659a903bf0..9ee63dbe52f 100644
-T @var{script} -Wl,@var{option} -Xlinker @var{option} @gol
-u @var{symbol} -z @var{keyword}}
-@@ -15708,6 +15711,33 @@ Specify that the program entry point is @var{entry}. The argument is
+@@ -15708,6 +15711,11 @@ Specify that the program entry point is @var{entry}. The argument is
interpreted by the linker; the GNU linker accepts either a symbol name
or an address.
@@ -82,28 +80,6 @@ index 6659a903bf0..9ee63dbe52f 100644
+@opindex nostdlib++
+Do not use the standard system C++ runtime libraries when linking.
+Only the libraries you specify will be passed to the linker.
-+
-+@cindex @option{-lgcc}, use with @option{-nostdlib}
-+@cindex @option{-nostdlib} and unresolved references
-+@cindex unresolved references and @option{-nostdlib}
-+@cindex @option{-lgcc}, use with @option{-nodefaultlibs}
-+@cindex @option{-nodefaultlibs} and unresolved references
-+@cindex unresolved references and @option{-nodefaultlibs}
-+One of the standard libraries bypassed by @option{-nostdlib} and
-+@option{-nodefaultlibs} is @file{libgcc.a}, a library of internal subroutines
-+which GCC uses to overcome shortcomings of particular machines, or special
-+needs for some languages.
-+(@xref{Interface,,Interfacing to GCC Output,gccint,GNU Compiler
-+Collection (GCC) Internals},
-+for more discussion of @file{libgcc.a}.)
-+In most cases, you need @file{libgcc.a} even when you want to avoid
-+other standard libraries. In other words, when you specify @option{-nostdlib}
-+or @option{-nodefaultlibs} you should usually specify @option{-lgcc} as well.
-+This ensures that you have no unresolved references to internal GCC
-+library subroutines.
-+(An example of such an internal subroutine is @code{__main}, used to ensure C++
-+constructors are called; @pxref{Collect2,,@code{collect2}, gccint,
-+GNU Compiler Collection (GCC) Internals}.)
+
@item -pie
@opindex pie
--
2.32.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/4] gcc: Drop broken/unneeded patch
2021-10-26 11:11 [PATCH 1/4] gcc: Merge three related patches together Richard Purdie
2021-10-26 11:11 ` [PATCH 2/4] gcc: Drop sdt (dtrace) header patch Richard Purdie
2021-10-26 11:11 ` [PATCH 3/4] gcc: Fix nolibstdc++ patch Richard Purdie
@ 2021-10-26 11:11 ` Richard Purdie
2021-10-26 15:53 ` [OE-core] " Khem Raj
2021-10-26 15:51 ` [OE-core] [PATCH 1/4] gcc: Merge three related patches together Khem Raj
2021-10-27 6:25 ` Jacob Kroon
4 siblings, 1 reply; 9+ messages in thread
From: Richard Purdie @ 2021-10-26 11:11 UTC (permalink / raw)
To: openembedded-core
This patch looks obsolete because it looks like part of an upstream
backport on a very old gcc version (4.3.3) and looks incomplete. The
diff also has little context making it likely to be a rebase error.
Builds seem find without it so drop it.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-devtools/gcc/gcc-11.2.inc | 1 -
...-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch | 70 -------------------
2 files changed, 71 deletions(-)
delete mode 100644 meta/recipes-devtools/gcc/gcc/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
diff --git a/meta/recipes-devtools/gcc/gcc-11.2.inc b/meta/recipes-devtools/gcc/gcc-11.2.inc
index 1ab779533ca..23dfea2319e 100644
--- a/meta/recipes-devtools/gcc/gcc-11.2.inc
+++ b/meta/recipes-devtools/gcc/gcc-11.2.inc
@@ -32,7 +32,6 @@ SRC_URI = "\
${BASEURI} \
file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
file://0002-gcc-poison-system-directories.patch \
- file://0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \
file://0004-64-bit-multilib-hack.patch \
file://0005-optional-libstdc.patch \
file://0006-COLLECT_GCC_OPTIONS.patch \
diff --git a/meta/recipes-devtools/gcc/gcc/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
deleted file mode 100644
index 7a676545557..00000000000
--- a/meta/recipes-devtools/gcc/gcc/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 274a27da6fe355c4c49953b3b69c8949d2412c62 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 29 Mar 2013 09:08:31 +0400
-Subject: [PATCH] gcc-4.3.3: SYSROOT_CFLAGS_FOR_TARGET
-
-Before committing, I noticed that PR/32161 was marked as a dup of PR/32009, but my previous patch did not fix it.
-
-This alternative patch is better because it lets you just use CFLAGS_FOR_TARGET to set the compilation flags for libgcc. Since bootstrapped target libraries are never compiled with the native compiler, it makes little sense to use different flags for stage1 and later stages. And it also makes little sense to use a different variable than CFLAGS_FOR_TARGET.
-
-Other changes I had to do include:
-
-- moving the creation of default CFLAGS_FOR_TARGET from Makefile.am to configure.ac, because otherwise the BOOT_CFLAGS are substituted into CFLAGS_FOR_TARGET (which is "-O2 -g $(CFLAGS)") via $(CFLAGS). It is also cleaner this way though.
-
-- passing the right CFLAGS to configure scripts as exported environment variables
-
-I also stopped passing LIBCFLAGS to configure scripts since they are unused in the whole src tree. And I updated the documentation as H-P reminded me to do.
-
-Bootstrapped/regtested i686-pc-linux-gnu, will commit to 4.4 shortly. Ok for 4.3?
-
-Signed-off-by: Paolo Bonzini <bonzini@gnu.org>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
----
- configure | 32 ++++++++++++++++++++++++++++++++
- 1 file changed, 32 insertions(+)
-
-diff --git a/configure b/configure
-index bcebad264ec..86e4ee7c383 100755
---- a/configure
-+++ b/configure
-@@ -8977,6 +8977,38 @@ fi
-
-
-
-+# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
-+# might be empty or "-g". We don't require a C++ compiler, so CXXFLAGS
-+# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
-+# We want to ensure that TARGET libraries (which we know are built with
-+# gcc) are built with "-O2 -g", so include those options when setting
-+# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
-+if test "x$CFLAGS_FOR_TARGET" = x; then
-+ CFLAGS_FOR_TARGET=$CFLAGS
-+ case " $CFLAGS " in
-+ *" -O2 "*) ;;
-+ *) CFLAGS_FOR_TARGET="-O2 $CFLAGS" ;;
-+ esac
-+ case " $CFLAGS " in
-+ *" -g "* | *" -g3 "*) ;;
-+ *) CFLAGS_FOR_TARGET="-g $CFLAGS" ;;
-+ esac
-+fi
-+
-+
-+if test "x$CXXFLAGS_FOR_TARGET" = x; then
-+ CXXFLAGS_FOR_TARGET=$CXXFLAGS
-+ case " $CXXFLAGS " in
-+ *" -O2 "*) ;;
-+ *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS" ;;
-+ esac
-+ case " $CXXFLAGS " in
-+ *" -g "* | *" -g3 "*) ;;
-+ *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS" ;;
-+ esac
-+fi
-+
-+
- # Handle --with-headers=XXX. If the value is not "yes", the contents of
- # the named directory are copied to $(tooldir)/sys-include.
- if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
--
2.32.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [OE-core] [PATCH 1/4] gcc: Merge three related patches together
2021-10-26 11:11 [PATCH 1/4] gcc: Merge three related patches together Richard Purdie
` (2 preceding siblings ...)
2021-10-26 11:11 ` [PATCH 4/4] gcc: Drop broken/unneeded patch Richard Purdie
@ 2021-10-26 15:51 ` Khem Raj
2021-10-27 6:25 ` Jacob Kroon
4 siblings, 0 replies; 9+ messages in thread
From: Khem Raj @ 2021-10-26 15:51 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
looks ok.
On Tue, Oct 26, 2021 at 4:11 AM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> The SYSTEMLIBS_DIR change was spread over three patches, merge these
> together since there is no value in having them separate.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> meta/recipes-devtools/gcc/gcc-11.2.inc | 2 -
> ...AMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 52 ++++++++++---------
> ...IR-replacement-instead-of-hardcoding.patch | 26 ----------
> ...22-aarch64-Add-support-for-musl-ldso.patch | 25 ---------
> 4 files changed, 28 insertions(+), 77 deletions(-)
> delete mode 100644 meta/recipes-devtools/gcc/gcc/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
> delete mode 100644 meta/recipes-devtools/gcc/gcc/0022-aarch64-Add-support-for-musl-ldso.patch
>
> diff --git a/meta/recipes-devtools/gcc/gcc-11.2.inc b/meta/recipes-devtools/gcc/gcc-11.2.inc
> index 9fd30f52a88..6fa344e9612 100644
> --- a/meta/recipes-devtools/gcc/gcc-11.2.inc
> +++ b/meta/recipes-devtools/gcc/gcc-11.2.inc
> @@ -50,8 +50,6 @@ SRC_URI = "\
> file://0018-export-CPP.patch \
> file://0019-Ensure-target-gcc-headers-can-be-included.patch \
> file://0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch \
> - file://0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \
> - file://0022-aarch64-Add-support-for-musl-ldso.patch \
> file://0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch \
> file://0024-handle-sysroot-support-for-nativesdk-gcc.patch \
> file://0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch \
> diff --git a/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
> index 4726267a80f..0884730786c 100644
> --- a/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
> +++ b/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
> @@ -30,8 +30,7 @@ Upstream-Status: Inappropriate [OE configuration]
> gcc/config/sparc/linux64.h | 4 ++--
> 12 files changed, 29 insertions(+), 34 deletions(-)
>
> -diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
> -index c1dae8ca2cf..3ce2b76c1a4 100644
> +unchanged:
> --- 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
> @@ -45,8 +44,7 @@ index c1dae8ca2cf..3ce2b76c1a4 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 85d0136e76e..6bd95855827 100644
> +unchanged:
> --- a/gcc/config/arm/linux-eabi.h
> +++ b/gcc/config/arm/linux-eabi.h
> @@ -65,8 +65,8 @@
> @@ -60,8 +58,7 @@ index 85d0136e76e..6bd95855827 100644
> #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT
>
> #define GLIBC_DYNAMIC_LINKER \
> -diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
> -index 0c1c4e70b6b..6bd643ade11 100644
> +unchanged:
> --- a/gcc/config/arm/linux-elf.h
> +++ b/gcc/config/arm/linux-elf.h
> @@ -60,7 +60,7 @@
> @@ -73,8 +70,7 @@ index 0c1c4e70b6b..6bd643ade11 100644
>
> #define LINUX_TARGET_LINK_SPEC "%{h*} \
> %{static:-Bstatic} \
> -diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
> -index 04b274f1654..7aafcf3ac2d 100644
> +unchanged:
> --- 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
> @@ -86,8 +82,7 @@ index 04b274f1654..7aafcf3ac2d 100644
>
> #undef MUSL_DYNAMIC_LINKER
> #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
> -diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
> -index b3822ced528..92d303e80d6 100644
> +unchanged:
> --- a/gcc/config/i386/linux64.h
> +++ b/gcc/config/i386/linux64.h
> @@ -27,9 +27,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
> @@ -103,8 +98,7 @@ index b3822ced528..92d303e80d6 100644
>
> #undef MUSL_DYNAMIC_LINKER32
> #define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
> -diff --git a/gcc/config/linux.h b/gcc/config/linux.h
> -index 4e1db60fced..87efc5f69fe 100644
> +unchanged:
> --- a/gcc/config/linux.h
> +++ b/gcc/config/linux.h
> @@ -94,10 +94,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
> @@ -122,8 +116,7 @@ index 4e1db60fced..87efc5f69fe 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/mips/linux.h b/gcc/config/mips/linux.h
> -index 44a85e410d9..8d41b5574f6 100644
> +unchanged:
> --- a/gcc/config/mips/linux.h
> +++ b/gcc/config/mips/linux.h
> @@ -22,20 +22,20 @@ along with GCC; see the file COPYING3. If not see
> @@ -153,8 +146,7 @@ index 44a85e410d9..8d41b5574f6 100644
>
> #undef MUSL_DYNAMIC_LINKER32
> #define MUSL_DYNAMIC_LINKER32 \
> -diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
> -index 9238de5bc92..7136a83260a 100644
> +unchanged:
> --- 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
> @@ -166,8 +158,7 @@ index 9238de5bc92..7136a83260a 100644
>
> #define MUSL_ABI_SUFFIX \
> "%{mabi=ilp32:-sf}" \
> -diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
> -index e3f2cd254f6..a11e01faa3d 100644
> +unchanged:
> --- a/gcc/config/rs6000/linux64.h
> +++ b/gcc/config/rs6000/linux64.h
> @@ -336,24 +336,19 @@ extern int dot_symbols;
> @@ -200,8 +191,7 @@ index e3f2cd254f6..a11e01faa3d 100644
>
> #undef DEFAULT_ASM_ENDIAN
> #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
> -diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h
> -index 7558d2f7195..3aaa6c3a078 100644
> +unchanged:
> --- a/gcc/config/sh/linux.h
> +++ b/gcc/config/sh/linux.h
> @@ -64,7 +64,7 @@ along with GCC; see the file COPYING3. If not see
> @@ -213,8 +203,7 @@ index 7558d2f7195..3aaa6c3a078 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 2550d7ee8f0..a94f4cd8ba2 100644
> +unchanged:
> --- 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);
> @@ -226,8 +215,7 @@ index 2550d7ee8f0..a94f4cd8ba2 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 95af8afa9b5..63127afb074 100644
> +unchanged:
> --- 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
> @@ -241,3 +229,19 @@ index 95af8afa9b5..63127afb074 100644
>
> #ifdef SPARC_BI_ARCH
>
> +diff -u b/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
> +--- b/gcc/config/aarch64/aarch64-linux.h
> ++++ b/gcc/config/aarch64/aarch64-linux.h
> +@@ -21,10 +21,10 @@
> + #ifndef GCC_AARCH64_LINUX_H
> + #define GCC_AARCH64_LINUX_H
> +
> +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
> ++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
> +
> + #undef MUSL_DYNAMIC_LINKER
> +-#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
> ++#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
> +
> + #undef ASAN_CC1_SPEC
> + #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}"
> diff --git a/meta/recipes-devtools/gcc/gcc/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch b/meta/recipes-devtools/gcc/gcc/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
> deleted file mode 100644
> index 0f3b3869b02..00000000000
> --- a/meta/recipes-devtools/gcc/gcc/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -From 7faad21154a76b200efcced9e12945057c94dff3 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Tue, 28 Apr 2015 23:15:27 -0700
> -Subject: [PATCH] Use SYSTEMLIBS_DIR replacement instead of hardcoding
> - base_libdir
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - gcc/config/aarch64/aarch64-linux.h | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
> -index 7f2529a2a1d..5303b39186f 100644
> ---- a/gcc/config/aarch64/aarch64-linux.h
> -+++ b/gcc/config/aarch64/aarch64-linux.h
> -@@ -21,7 +21,7 @@
> - #ifndef GCC_AARCH64_LINUX_H
> - #define GCC_AARCH64_LINUX_H
> -
> --#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
> -+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
> -
> - #undef MUSL_DYNAMIC_LINKER
> - #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
> diff --git a/meta/recipes-devtools/gcc/gcc/0022-aarch64-Add-support-for-musl-ldso.patch b/meta/recipes-devtools/gcc/gcc/0022-aarch64-Add-support-for-musl-ldso.patch
> deleted file mode 100644
> index 41536a8a3b4..00000000000
> --- a/meta/recipes-devtools/gcc/gcc/0022-aarch64-Add-support-for-musl-ldso.patch
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -From 96aa24a874331a318693e4fccc4bc4e7d3fbad2b Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Tue, 28 Apr 2015 23:18:39 -0700
> -Subject: [PATCH] aarch64: Add support for musl ldso
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - gcc/config/aarch64/aarch64-linux.h | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
> -index 5303b39186f..4bcae7f3110 100644
> ---- a/gcc/config/aarch64/aarch64-linux.h
> -+++ b/gcc/config/aarch64/aarch64-linux.h
> -@@ -24,7 +24,7 @@
> - #define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
> -
> - #undef MUSL_DYNAMIC_LINKER
> --#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
> -+#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
> -
> - #undef ASAN_CC1_SPEC
> - #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}"
> --
> 2.32.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#157383): https://lists.openembedded.org/g/openembedded-core/message/157383
> Mute This Topic: https://lists.openembedded.org/mt/86599747/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [OE-core] [PATCH 3/4] gcc: Fix nolibstdc++ patch
2021-10-26 11:11 ` [PATCH 3/4] gcc: Fix nolibstdc++ patch Richard Purdie
@ 2021-10-26 15:51 ` Khem Raj
0 siblings, 0 replies; 9+ messages in thread
From: Khem Raj @ 2021-10-26 15:51 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
thanks, I guess since it was documentation no one noticed it.
On Tue, Oct 26, 2021 at 4:11 AM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> Somewhere along the line the docs patch was corrupted with incorrect
> changes. Strip these out and clean up the patch.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> .../gcc/gcc/0005-optional-libstdc.patch | 28 ++-----------------
> 1 file changed, 2 insertions(+), 26 deletions(-)
>
> diff --git a/meta/recipes-devtools/gcc/gcc/0005-optional-libstdc.patch b/meta/recipes-devtools/gcc/gcc/0005-optional-libstdc.patch
> index c921ac3340c..c64fbf6a976 100644
> --- a/meta/recipes-devtools/gcc/gcc/0005-optional-libstdc.patch
> +++ b/meta/recipes-devtools/gcc/gcc/0005-optional-libstdc.patch
> @@ -55,12 +55,10 @@ diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
> index 6659a903bf0..9ee63dbe52f 100644
> --- a/gcc/doc/invoke.texi
> +++ b/gcc/doc/invoke.texi
> -@@ -239,6 +239,9 @@ in the following sections.
> +@@ -239,6 +239,7 @@ in the following sections.
> -fno-weak -nostdinc++ @gol
> -fvisibility-inlines-hidden @gol
> -fvisibility-ms-compat @gol
> -+-fvtable-verify=@r{[}std@r{|}preinit@r{|}none@r{]} @gol
> -+-fvtv-counts -fvtv-debug @gol
> +-nostdlib++ @gol
> -fext-numeric-literals @gol
> -flang-info-include-translate@r{[}=@var{header}@r{]} @gol
> @@ -74,7 +72,7 @@ index 6659a903bf0..9ee63dbe52f 100644
> -T @var{script} -Wl,@var{option} -Xlinker @var{option} @gol
> -u @var{symbol} -z @var{keyword}}
>
> -@@ -15708,6 +15711,33 @@ Specify that the program entry point is @var{entry}. The argument is
> +@@ -15708,6 +15711,11 @@ Specify that the program entry point is @var{entry}. The argument is
> interpreted by the linker; the GNU linker accepts either a symbol name
> or an address.
>
> @@ -82,28 +80,6 @@ index 6659a903bf0..9ee63dbe52f 100644
> +@opindex nostdlib++
> +Do not use the standard system C++ runtime libraries when linking.
> +Only the libraries you specify will be passed to the linker.
> -+
> -+@cindex @option{-lgcc}, use with @option{-nostdlib}
> -+@cindex @option{-nostdlib} and unresolved references
> -+@cindex unresolved references and @option{-nostdlib}
> -+@cindex @option{-lgcc}, use with @option{-nodefaultlibs}
> -+@cindex @option{-nodefaultlibs} and unresolved references
> -+@cindex unresolved references and @option{-nodefaultlibs}
> -+One of the standard libraries bypassed by @option{-nostdlib} and
> -+@option{-nodefaultlibs} is @file{libgcc.a}, a library of internal subroutines
> -+which GCC uses to overcome shortcomings of particular machines, or special
> -+needs for some languages.
> -+(@xref{Interface,,Interfacing to GCC Output,gccint,GNU Compiler
> -+Collection (GCC) Internals},
> -+for more discussion of @file{libgcc.a}.)
> -+In most cases, you need @file{libgcc.a} even when you want to avoid
> -+other standard libraries. In other words, when you specify @option{-nostdlib}
> -+or @option{-nodefaultlibs} you should usually specify @option{-lgcc} as well.
> -+This ensures that you have no unresolved references to internal GCC
> -+library subroutines.
> -+(An example of such an internal subroutine is @code{__main}, used to ensure C++
> -+constructors are called; @pxref{Collect2,,@code{collect2}, gccint,
> -+GNU Compiler Collection (GCC) Internals}.)
> +
> @item -pie
> @opindex pie
> --
> 2.32.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#157385): https://lists.openembedded.org/g/openembedded-core/message/157385
> Mute This Topic: https://lists.openembedded.org/mt/86599749/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [OE-core] [PATCH 2/4] gcc: Drop sdt (dtrace) header patch
2021-10-26 11:11 ` [PATCH 2/4] gcc: Drop sdt (dtrace) header patch Richard Purdie
@ 2021-10-26 15:52 ` Khem Raj
0 siblings, 0 replies; 9+ messages in thread
From: Khem Raj @ 2021-10-26 15:52 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
ok
On Tue, Oct 26, 2021 at 4:11 AM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> Since we now have recipe specific sysroots we no longer need this patch
> to avoid the dtrace headers affecting the build of gcc-runtime. Drop
> the patch.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> meta/recipes-devtools/gcc/gcc-11.2.inc | 1 -
> .../gcc/gcc/0013-Disable-sdt.patch | 110 ------------------
> 2 files changed, 111 deletions(-)
> delete mode 100644 meta/recipes-devtools/gcc/gcc/0013-Disable-sdt.patch
>
> diff --git a/meta/recipes-devtools/gcc/gcc-11.2.inc b/meta/recipes-devtools/gcc/gcc-11.2.inc
> index 6fa344e9612..1ab779533ca 100644
> --- a/meta/recipes-devtools/gcc/gcc-11.2.inc
> +++ b/meta/recipes-devtools/gcc/gcc-11.2.inc
> @@ -42,7 +42,6 @@ SRC_URI = "\
> file://0010-MIPS64-Default-to-N64-ABI.patch \
> file://0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch \
> file://0012-gcc-Fix-argument-list-too-long-error.patch \
> - file://0013-Disable-sdt.patch \
> file://0014-libtool.patch \
> file://0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \
> file://0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch \
> diff --git a/meta/recipes-devtools/gcc/gcc/0013-Disable-sdt.patch b/meta/recipes-devtools/gcc/gcc/0013-Disable-sdt.patch
> deleted file mode 100644
> index 1e657666df9..00000000000
> --- a/meta/recipes-devtools/gcc/gcc/0013-Disable-sdt.patch
> +++ /dev/null
> @@ -1,110 +0,0 @@
> -From 7928a4eddc4a6d821a6aa6eaaea1fd60d54e3da9 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Fri, 29 Mar 2013 09:28:10 +0400
> -Subject: [PATCH] Disable sdt.
> -
> -We don't list dtrace in DEPENDS so we shouldn't be depending on this header.
> -It may or may not exist from preivous builds though. To be determinstic, disable
> -sdt.h usage always. This avoids build failures if the header is removed after configure
> -but before libgcc is compiled for example.
> -
> -RP 2012/8/7
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -
> -Disable sdt for libstdc++-v3.
> -
> -Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> -
> -Upstream-Status: Inappropriate [hack]
> ----
> - gcc/configure | 12 ++++++------
> - gcc/configure.ac | 18 +++++++++---------
> - libstdc++-v3/configure | 6 +++---
> - libstdc++-v3/configure.ac | 2 +-
> - 4 files changed, 19 insertions(+), 19 deletions(-)
> -
> -diff --git a/gcc/configure b/gcc/configure
> -index c5d3bc4ee2d..5160917d73e 100755
> ---- a/gcc/configure
> -+++ b/gcc/configure
> -@@ -30812,12 +30812,12 @@ fi
> - { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5
> - $as_echo_n "checking sys/sdt.h in the target C library... " >&6; }
> - have_sys_sdt_h=no
> --if test -f $target_header_dir/sys/sdt.h; then
> -- have_sys_sdt_h=yes
> --
> --$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
> --
> --fi
> -+#if test -f $target_header_dir/sys/sdt.h; then
> -+# have_sys_sdt_h=yes
> -+#
> -+#$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
> -+#
> -+#fi
> - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5
> - $as_echo "$have_sys_sdt_h" >&6; }
> -
> -diff --git a/gcc/configure.ac b/gcc/configure.ac
> -index f83420326d6..50f78308e8a 100644
> ---- a/gcc/configure.ac
> -+++ b/gcc/configure.ac
> -@@ -6653,15 +6653,15 @@ fi
> - AC_SUBST([enable_default_ssp])
> -
> - # Test for <sys/sdt.h> on the target.
> --GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H])
> --AC_MSG_CHECKING(sys/sdt.h in the target C library)
> --have_sys_sdt_h=no
> --if test -f $target_header_dir/sys/sdt.h; then
> -- have_sys_sdt_h=yes
> -- AC_DEFINE(HAVE_SYS_SDT_H, 1,
> -- [Define if your target C library provides sys/sdt.h])
> --fi
> --AC_MSG_RESULT($have_sys_sdt_h)
> -+#GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H])
> -+#AC_MSG_CHECKING(sys/sdt.h in the target C library)
> -+#have_sys_sdt_h=no
> -+#if test -f $target_header_dir/sys/sdt.h; then
> -+# have_sys_sdt_h=yes
> -+# AC_DEFINE(HAVE_SYS_SDT_H, 1,
> -+# [Define if your target C library provides sys/sdt.h])
> -+#fi
> -+#AC_MSG_RESULT($have_sys_sdt_h)
> -
> - # Check if TFmode long double should be used by default or not.
> - # Some glibc targets used DFmode long double, but with glibc 2.4
> -diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
> -index a310e9feb6c..c879445b8a6 100755
> ---- a/libstdc++-v3/configure
> -+++ b/libstdc++-v3/configure
> -@@ -22014,11 +22014,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
> - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
> - ac_compiler_gnu=$ac_cv_c_compiler_gnu
> -
> -- if test $glibcxx_cv_sys_sdt_h = yes; then
> -+# if test $glibcxx_cv_sys_sdt_h = yes; then
> -
> --$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
> -+#$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
> -
> -- fi
> -+# fi
> - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_sys_sdt_h" >&5
> - $as_echo "$glibcxx_cv_sys_sdt_h" >&6; }
> -
> -diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
> -index 3c799be82b1..3f63a8ec9ce 100644
> ---- a/libstdc++-v3/configure.ac
> -+++ b/libstdc++-v3/configure.ac
> -@@ -240,7 +240,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN
> - GLIBCXX_CHECK_SC_NPROC_ONLN
> - GLIBCXX_CHECK_PTHREADS_NUM_PROCESSORS_NP
> - GLIBCXX_CHECK_SYSCTL_HW_NCPU
> --GLIBCXX_CHECK_SDT_H
> -+#GLIBCXX_CHECK_SDT_H
> -
> - # Check for available headers.
> - AC_CHECK_HEADERS([endian.h execinfo.h float.h fp.h ieeefp.h inttypes.h \
> --
> 2.32.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#157384): https://lists.openembedded.org/g/openembedded-core/message/157384
> Mute This Topic: https://lists.openembedded.org/mt/86599748/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [OE-core] [PATCH 4/4] gcc: Drop broken/unneeded patch
2021-10-26 11:11 ` [PATCH 4/4] gcc: Drop broken/unneeded patch Richard Purdie
@ 2021-10-26 15:53 ` Khem Raj
0 siblings, 0 replies; 9+ messages in thread
From: Khem Raj @ 2021-10-26 15:53 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
On Tue, Oct 26, 2021 at 4:11 AM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> This patch looks obsolete because it looks like part of an upstream
> backport on a very old gcc version (4.3.3) and looks incomplete. The
> diff also has little context making it likely to be a rebase error.
>
> Builds seem find without it so drop it.
>
IIRC it was not accepted upstream but perhaps a different one was.
However if it builds for us without issues then drop it.
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> meta/recipes-devtools/gcc/gcc-11.2.inc | 1 -
> ...-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch | 70 -------------------
> 2 files changed, 71 deletions(-)
> delete mode 100644 meta/recipes-devtools/gcc/gcc/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
>
> diff --git a/meta/recipes-devtools/gcc/gcc-11.2.inc b/meta/recipes-devtools/gcc/gcc-11.2.inc
> index 1ab779533ca..23dfea2319e 100644
> --- a/meta/recipes-devtools/gcc/gcc-11.2.inc
> +++ b/meta/recipes-devtools/gcc/gcc-11.2.inc
> @@ -32,7 +32,6 @@ SRC_URI = "\
> ${BASEURI} \
> file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
> file://0002-gcc-poison-system-directories.patch \
> - file://0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \
> file://0004-64-bit-multilib-hack.patch \
> file://0005-optional-libstdc.patch \
> file://0006-COLLECT_GCC_OPTIONS.patch \
> diff --git a/meta/recipes-devtools/gcc/gcc/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
> deleted file mode 100644
> index 7a676545557..00000000000
> --- a/meta/recipes-devtools/gcc/gcc/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
> +++ /dev/null
> @@ -1,70 +0,0 @@
> -From 274a27da6fe355c4c49953b3b69c8949d2412c62 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Fri, 29 Mar 2013 09:08:31 +0400
> -Subject: [PATCH] gcc-4.3.3: SYSROOT_CFLAGS_FOR_TARGET
> -
> -Before committing, I noticed that PR/32161 was marked as a dup of PR/32009, but my previous patch did not fix it.
> -
> -This alternative patch is better because it lets you just use CFLAGS_FOR_TARGET to set the compilation flags for libgcc. Since bootstrapped target libraries are never compiled with the native compiler, it makes little sense to use different flags for stage1 and later stages. And it also makes little sense to use a different variable than CFLAGS_FOR_TARGET.
> -
> -Other changes I had to do include:
> -
> -- moving the creation of default CFLAGS_FOR_TARGET from Makefile.am to configure.ac, because otherwise the BOOT_CFLAGS are substituted into CFLAGS_FOR_TARGET (which is "-O2 -g $(CFLAGS)") via $(CFLAGS). It is also cleaner this way though.
> -
> -- passing the right CFLAGS to configure scripts as exported environment variables
> -
> -I also stopped passing LIBCFLAGS to configure scripts since they are unused in the whole src tree. And I updated the documentation as H-P reminded me to do.
> -
> -Bootstrapped/regtested i686-pc-linux-gnu, will commit to 4.4 shortly. Ok for 4.3?
> -
> -Signed-off-by: Paolo Bonzini <bonzini@gnu.org>
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -
> -Upstream-Status: Pending
> ----
> - configure | 32 ++++++++++++++++++++++++++++++++
> - 1 file changed, 32 insertions(+)
> -
> -diff --git a/configure b/configure
> -index bcebad264ec..86e4ee7c383 100755
> ---- a/configure
> -+++ b/configure
> -@@ -8977,6 +8977,38 @@ fi
> -
> -
> -
> -+# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
> -+# might be empty or "-g". We don't require a C++ compiler, so CXXFLAGS
> -+# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
> -+# We want to ensure that TARGET libraries (which we know are built with
> -+# gcc) are built with "-O2 -g", so include those options when setting
> -+# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
> -+if test "x$CFLAGS_FOR_TARGET" = x; then
> -+ CFLAGS_FOR_TARGET=$CFLAGS
> -+ case " $CFLAGS " in
> -+ *" -O2 "*) ;;
> -+ *) CFLAGS_FOR_TARGET="-O2 $CFLAGS" ;;
> -+ esac
> -+ case " $CFLAGS " in
> -+ *" -g "* | *" -g3 "*) ;;
> -+ *) CFLAGS_FOR_TARGET="-g $CFLAGS" ;;
> -+ esac
> -+fi
> -+
> -+
> -+if test "x$CXXFLAGS_FOR_TARGET" = x; then
> -+ CXXFLAGS_FOR_TARGET=$CXXFLAGS
> -+ case " $CXXFLAGS " in
> -+ *" -O2 "*) ;;
> -+ *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS" ;;
> -+ esac
> -+ case " $CXXFLAGS " in
> -+ *" -g "* | *" -g3 "*) ;;
> -+ *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS" ;;
> -+ esac
> -+fi
> -+
> -+
> - # Handle --with-headers=XXX. If the value is not "yes", the contents of
> - # the named directory are copied to $(tooldir)/sys-include.
> - if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
> --
> 2.32.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#157386): https://lists.openembedded.org/g/openembedded-core/message/157386
> Mute This Topic: https://lists.openembedded.org/mt/86599750/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [OE-core] [PATCH 1/4] gcc: Merge three related patches together
2021-10-26 11:11 [PATCH 1/4] gcc: Merge three related patches together Richard Purdie
` (3 preceding siblings ...)
2021-10-26 15:51 ` [OE-core] [PATCH 1/4] gcc: Merge three related patches together Khem Raj
@ 2021-10-27 6:25 ` Jacob Kroon
4 siblings, 0 replies; 9+ messages in thread
From: Jacob Kroon @ 2021-10-27 6:25 UTC (permalink / raw)
To: openembedded-core
On 10/26/21 13:11, Richard Purdie wrote:
> The SYSTEMLIBS_DIR change was spread over three patches, merge these
> together since there is no value in having them separate.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> meta/recipes-devtools/gcc/gcc-11.2.inc | 2 -
> ...AMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 52 ++++++++++---------
> ...IR-replacement-instead-of-hardcoding.patch | 26 ----------
> ...22-aarch64-Add-support-for-musl-ldso.patch | 25 ---------
> 4 files changed, 28 insertions(+), 77 deletions(-)
> delete mode 100644 meta/recipes-devtools/gcc/gcc/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
> delete mode 100644 meta/recipes-devtools/gcc/gcc/0022-aarch64-Add-support-for-musl-ldso.patch
>
> diff --git a/meta/recipes-devtools/gcc/gcc-11.2.inc b/meta/recipes-devtools/gcc/gcc-11.2.inc
> index 9fd30f52a88..6fa344e9612 100644
> --- a/meta/recipes-devtools/gcc/gcc-11.2.inc
> +++ b/meta/recipes-devtools/gcc/gcc-11.2.inc
> @@ -50,8 +50,6 @@ SRC_URI = "\
> file://0018-export-CPP.patch \
> file://0019-Ensure-target-gcc-headers-can-be-included.patch \
> file://0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch \
> - file://0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \
> - file://0022-aarch64-Add-support-for-musl-ldso.patch \
> file://0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch \
> file://0024-handle-sysroot-support-for-nativesdk-gcc.patch \
> file://0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch \
> diff --git a/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
> index 4726267a80f..0884730786c 100644
> --- a/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
> +++ b/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
> @@ -30,8 +30,7 @@ Upstream-Status: Inappropriate [OE configuration]
> gcc/config/sparc/linux64.h | 4 ++--
> 12 files changed, 29 insertions(+), 34 deletions(-)
>
> -diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
> -index c1dae8ca2cf..3ce2b76c1a4 100644
> +unchanged:
> --- 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
> @@ -45,8 +44,7 @@ index c1dae8ca2cf..3ce2b76c1a4 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 85d0136e76e..6bd95855827 100644
> +unchanged:
Doesn't the above change how the patch is applied ?
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-10-27 6:25 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-26 11:11 [PATCH 1/4] gcc: Merge three related patches together Richard Purdie
2021-10-26 11:11 ` [PATCH 2/4] gcc: Drop sdt (dtrace) header patch Richard Purdie
2021-10-26 15:52 ` [OE-core] " Khem Raj
2021-10-26 11:11 ` [PATCH 3/4] gcc: Fix nolibstdc++ patch Richard Purdie
2021-10-26 15:51 ` [OE-core] " Khem Raj
2021-10-26 11:11 ` [PATCH 4/4] gcc: Drop broken/unneeded patch Richard Purdie
2021-10-26 15:53 ` [OE-core] " Khem Raj
2021-10-26 15:51 ` [OE-core] [PATCH 1/4] gcc: Merge three related patches together Khem Raj
2021-10-27 6:25 ` Jacob Kroon
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.