diff --git a/blacklist.conf b/blacklist.conf index 10d5cb4..2d74791 100644 --- a/blacklist.conf +++ b/blacklist.conf @@ -819,3 +819,11 @@ f81fead027ecbb525c29d681eb95a222e76306a3 # correction in a comment only 9dba4d24cbb5524dd39ab1e08886373b17f07ff2 # breaks KABI d43b020b0f82c088ef8ff3196ef00575a97d200e # bug introduced by 4831967640916 not present 838d6d3461db0fdbf33fc5f8a69c27b50b4a46da # breaks KABI +e3ec8e0f5711d73f7e5d5c3cffdf4fad4f1487b9 # s390 kABI breakage +53ae7230918154d1f4281d7aa3aae9650436eadf # hardly relevant LLVM test fix +9de209c7d584d6e06ad92f120d83d4f27c200497 # according to the commit message it does not fix a bug +f09354ffd84eef3c88efa8ba6df05efe50cfd16a # just a message improvement +dc306186a130c6d9feb0aabc1c71b8ed1674a3bf # does not fix an actual bug +dc2ab23b992c9d5dab93b9bf01b10b10465e537e # does not fix an actual bug +9097fc793f74ef9c677f8c4aed0c24f6f07f0133 # s390 kABI breakage +ed0192bc644f3553d64a5cb461bdd0b1fbae3fdf # does not fix an actual bug diff --git a/patches.suse/s390-vdso-remove-nostdlib-compiler-flag.patch b/patches.suse/s390-vdso-remove-nostdlib-compiler-flag.patch new file mode 100644 index 0000000..03065fa --- /dev/null +++ b/patches.suse/s390-vdso-remove-nostdlib-compiler-flag.patch @@ -0,0 +1,50 @@ +From: Masahiro Yamada +Date: Mon, 8 Nov 2021 01:21:11 +0900 +Subject: s390/vdso: remove -nostdlib compiler flag +Git-commit: 7b737adc10d269e7fdf714ae2caa2281b6a801cf +Patch-mainline: v5.16-rc2 +References: git-fixes bsc#1211714 + +The -nostdlib option requests the compiler to not use the standard +system startup files or libraries when linking. It is effective only +when $(CC) is used as a linker driver. + +Since commit 2b2a25845d53 ("s390/vdso: Use $(LD) instead of $(CC) to +link vDSO"), $(LD) is directly used, hence -nostdlib is unneeded. + +Signed-off-by: Masahiro Yamada +Link: https://lore.kernel.org/r/20211107162111.323701-1-masahiroy@kernel.org +Signed-off-by: Heiko Carstens +Acked-by: Miroslav Franc +--- + arch/s390/kernel/vdso32/Makefile | 2 +- + arch/s390/kernel/vdso64/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/s390/kernel/vdso32/Makefile b/arch/s390/kernel/vdso32/Makefile +index e3e6ac5686df..245bddfe9bc0 100644 +--- a/arch/s390/kernel/vdso32/Makefile ++++ b/arch/s390/kernel/vdso32/Makefile +@@ -22,7 +22,7 @@ KBUILD_AFLAGS_32 += -m31 -s + KBUILD_CFLAGS_32 := $(filter-out -m64,$(KBUILD_CFLAGS)) + KBUILD_CFLAGS_32 += -m31 -fPIC -shared -fno-common -fno-builtin + +-LDFLAGS_vdso32.so.dbg += -fPIC -shared -nostdlib -soname=linux-vdso32.so.1 \ ++LDFLAGS_vdso32.so.dbg += -fPIC -shared -soname=linux-vdso32.so.1 \ + --hash-style=both --build-id=sha1 -melf_s390 -T + + $(targets:%=$(obj)/%.dbg): KBUILD_CFLAGS = $(KBUILD_CFLAGS_32) +diff --git a/arch/s390/kernel/vdso64/Makefile b/arch/s390/kernel/vdso64/Makefile +index 6568de236701..e7d911780935 100644 +--- a/arch/s390/kernel/vdso64/Makefile ++++ b/arch/s390/kernel/vdso64/Makefile +@@ -25,7 +25,7 @@ KBUILD_AFLAGS_64 += -m64 -s + + KBUILD_CFLAGS_64 := $(filter-out -m64,$(KBUILD_CFLAGS)) + KBUILD_CFLAGS_64 += -m64 -fPIC -shared -fno-common -fno-builtin +-ldflags-y := -fPIC -shared -nostdlib -soname=linux-vdso64.so.1 \ ++ldflags-y := -fPIC -shared -soname=linux-vdso64.so.1 \ + --hash-style=both --build-id=sha1 -T + + $(targets:%=$(obj)/%.dbg): KBUILD_CFLAGS = $(KBUILD_CFLAGS_64) + diff --git a/series.conf b/series.conf index af49588..b163b96 100644 --- a/series.conf +++ b/series.conf @@ -7397,6 +7397,7 @@ patches.suse/cifs-introduce-cifs_ses_mark_for_reconnect-helper.patch patches.suse/s390-setup-avoid-reserving-memory-above-identity-mapping patches.suse/s390-boot-simplify-and-fix-kernel-memory-layout-setup.patch + patches.suse/s390-vdso-remove-nostdlib-compiler-flag.patch patches.suse/s390-kexec-fix-return-code-handling patches.suse/s390-kexec-fix-memory-leak-of-ipl-report-buffer patches.suse/ACPI-Add-stubs-for-wakeup-handler-functions.patch