From ee49575f1f6eca233cd51dc2ec500b3cb1ea2c4d Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Mon, 4 Dec 2023 16:07:13 -0500 Subject: [PATCH] Drop arm64-make-cpu_big_endian-depend-on-ld.bfd-or-ld.lld.patch Signed-off-by: Sasha Levin --- ...ig_endian-depend-on-ld.bfd-or-ld.lld.patch | 59 ------------------- queue-4.19/series | 1 - ...ig_endian-depend-on-ld.bfd-or-ld.lld.patch | 59 ------------------- queue-5.4/series | 1 - 4 files changed, 120 deletions(-) delete mode 100644 queue-4.19/arm64-make-cpu_big_endian-depend-on-ld.bfd-or-ld.lld.patch delete mode 100644 queue-5.4/arm64-make-cpu_big_endian-depend-on-ld.bfd-or-ld.lld.patch diff --git a/queue-4.19/arm64-make-cpu_big_endian-depend-on-ld.bfd-or-ld.lld.patch b/queue-4.19/arm64-make-cpu_big_endian-depend-on-ld.bfd-or-ld.lld.patch deleted file mode 100644 index 9c4e01d6eda..00000000000 --- a/queue-4.19/arm64-make-cpu_big_endian-depend-on-ld.bfd-or-ld.lld.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 354a6aad1bac79aafc40ddfabe5f0cdb119b00dc Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 8 Feb 2021 17:57:20 -0700 -Subject: arm64: Make CPU_BIG_ENDIAN depend on ld.bfd or ld.lld 13.0.0+ - -From: Nathan Chancellor - -[ Upstream commit e9c6deee00e9197e75cd6aa0d265d3d45bd7cc28 ] - -Similar to commit 28187dc8ebd9 ("ARM: 9025/1: Kconfig: CPU_BIG_ENDIAN -depends on !LD_IS_LLD"), ld.lld prior to 13.0.0 does not properly -support aarch64 big endian, leading to the following build error when -CONFIG_CPU_BIG_ENDIAN is selected: - -ld.lld: error: unknown emulation: aarch64linuxb - -This has been resolved in LLVM 13. To avoid errors like this, only allow -CONFIG_CPU_BIG_ENDIAN to be selected if using ld.bfd or ld.lld 13.0.0 -and newer. - -While we are here, the indentation of this symbol used spaces since its -introduction in commit a872013d6d03 ("arm64: kconfig: allow -CPU_BIG_ENDIAN to be selected"). Change it to tabs to be consistent with -kernel coding style. - -Link: https://github.com/ClangBuiltLinux/linux/issues/380 -Link: https://github.com/ClangBuiltLinux/linux/issues/1288 -Link: https://github.com/llvm/llvm-project/commit/7605a9a009b5fa3bdac07e3131c8d82f6d08feb7 -Link: https://github.com/llvm/llvm-project/commit/eea34aae2e74e9b6fbdd5b95f479bc7f397bf387 -Reported-by: Arnd Bergmann -Signed-off-by: Nathan Chancellor -Reviewed-by: Nick Desaulniers -Link: https://lore.kernel.org/r/20210209005719.803608-1-nathan@kernel.org -Signed-off-by: Will Deacon -Stable-dep-of: 146a15b87335 ("arm64: Restrict CPU_BIG_ENDIAN to GNU as or LLVM IAS 15.x or newer") -Signed-off-by: Sasha Levin ---- - arch/arm64/Kconfig | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 04ff19aa948a1..92646f12a66d2 100644 ---- a/arch/arm64/Kconfig -+++ b/arch/arm64/Kconfig -@@ -757,8 +757,9 @@ choice - that is selected here. - - config CPU_BIG_ENDIAN -- bool "Build big-endian kernel" -- help -+ bool "Build big-endian kernel" -+ depends on !LD_IS_LLD || LLD_VERSION >= 130000 -+ help - Say Y if you plan on running a kernel with a big-endian userspace. - - config CPU_LITTLE_ENDIAN --- -2.42.0 - diff --git a/queue-4.19/series b/queue-4.19/series index 8a299078279..221168cddf9 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -55,7 +55,6 @@ pci-aspm-disable-only-aspm_state_l1-when-driver-disa.patch revert-pci-aspm-disable-only-aspm_state_l1-when-driv.patch s390-mm-fix-phys-vs-virt-confusion-in-mark_kernel_px.patch s390-cmma-fix-detection-of-dat-pages.patch -arm64-make-cpu_big_endian-depend-on-ld.bfd-or-ld.lld.patch arm64-restrict-cpu_big_endian-to-gnu-as-or-llvm-ias-.patch mtd-cfi_cmdset_0001-support-the-absence-of-protectio.patch mtd-cfi_cmdset_0001-byte-swap-otp-info.patch diff --git a/queue-5.4/arm64-make-cpu_big_endian-depend-on-ld.bfd-or-ld.lld.patch b/queue-5.4/arm64-make-cpu_big_endian-depend-on-ld.bfd-or-ld.lld.patch deleted file mode 100644 index 60466b62a8b..00000000000 --- a/queue-5.4/arm64-make-cpu_big_endian-depend-on-ld.bfd-or-ld.lld.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 3012012bdce962b1e725e342cc20b11244403591 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 8 Feb 2021 17:57:20 -0700 -Subject: arm64: Make CPU_BIG_ENDIAN depend on ld.bfd or ld.lld 13.0.0+ - -From: Nathan Chancellor - -[ Upstream commit e9c6deee00e9197e75cd6aa0d265d3d45bd7cc28 ] - -Similar to commit 28187dc8ebd9 ("ARM: 9025/1: Kconfig: CPU_BIG_ENDIAN -depends on !LD_IS_LLD"), ld.lld prior to 13.0.0 does not properly -support aarch64 big endian, leading to the following build error when -CONFIG_CPU_BIG_ENDIAN is selected: - -ld.lld: error: unknown emulation: aarch64linuxb - -This has been resolved in LLVM 13. To avoid errors like this, only allow -CONFIG_CPU_BIG_ENDIAN to be selected if using ld.bfd or ld.lld 13.0.0 -and newer. - -While we are here, the indentation of this symbol used spaces since its -introduction in commit a872013d6d03 ("arm64: kconfig: allow -CPU_BIG_ENDIAN to be selected"). Change it to tabs to be consistent with -kernel coding style. - -Link: https://github.com/ClangBuiltLinux/linux/issues/380 -Link: https://github.com/ClangBuiltLinux/linux/issues/1288 -Link: https://github.com/llvm/llvm-project/commit/7605a9a009b5fa3bdac07e3131c8d82f6d08feb7 -Link: https://github.com/llvm/llvm-project/commit/eea34aae2e74e9b6fbdd5b95f479bc7f397bf387 -Reported-by: Arnd Bergmann -Signed-off-by: Nathan Chancellor -Reviewed-by: Nick Desaulniers -Link: https://lore.kernel.org/r/20210209005719.803608-1-nathan@kernel.org -Signed-off-by: Will Deacon -Stable-dep-of: 146a15b87335 ("arm64: Restrict CPU_BIG_ENDIAN to GNU as or LLVM IAS 15.x or newer") -Signed-off-by: Sasha Levin ---- - arch/arm64/Kconfig | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 185262e0e1da3..306772b7de5fc 100644 ---- a/arch/arm64/Kconfig -+++ b/arch/arm64/Kconfig -@@ -886,8 +886,9 @@ choice - that is selected here. - - config CPU_BIG_ENDIAN -- bool "Build big-endian kernel" -- help -+ bool "Build big-endian kernel" -+ depends on !LD_IS_LLD || LLD_VERSION >= 130000 -+ help - Say Y if you plan on running a kernel with a big-endian userspace. - - config CPU_LITTLE_ENDIAN --- -2.42.0 - diff --git a/queue-5.4/series b/queue-5.4/series index 69f85e255b6..5f5d7fb8cff 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -74,7 +74,6 @@ perf-intel-pt-fix-async-branch-flags.patch smb3-fix-touch-h-of-symlink.patch s390-mm-fix-phys-vs-virt-confusion-in-mark_kernel_px.patch s390-cmma-fix-detection-of-dat-pages.patch -arm64-make-cpu_big_endian-depend-on-ld.bfd-or-ld.lld.patch arm64-restrict-cpu_big_endian-to-gnu-as-or-llvm-ias-.patch mtd-cfi_cmdset_0001-support-the-absence-of-protectio.patch mtd-cfi_cmdset_0001-byte-swap-otp-info.patch -- 2.47.3