From: Masahiro Yamada <masahiroy@kernel.org>

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 <masahiroy@kernel.org>

Link: https://lore.kernel.org/r/20211107162111.323701-1-masahiroy@kernel.org

Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

Acked-by: Miroslav Franc <mfranc@suse.cz>

---

 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)