looks ok.
On Tue, Oct 26, 2021 at 4:11 AM 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
> ---
> 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:
> ---
