diff options
| author | Peter Foley <pefoley2@pefoley.com> | 2023-01-12 23:49:10 -0500 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2023-02-13 10:14:20 +0100 |
| commit | 6aa56115c73b37270e53aa91984bdb8b60164ec7 (patch) | |
| tree | fd648b53e81ae3d7802dc65d8b3273dd3105f50a /arch/um | |
| parent | 910dba41239224069c17bb6c30c9d43c1ba229f1 (diff) | |
| download | linux-6aa56115c73b37270e53aa91984bdb8b60164ec7.tar.gz | |
um: Use CFLAGS_vmlinux
link-vmlinux.sh doesn't use LDFLAGS_vmlinux when linking the kernel for
UML. Move the LDFLAGS_EXESTACK options into CFLAGS_vmlinux so they're
actually respected.
e.g.
/usr/lib/gcc/x86_64-pc-linux-gnu/12/../../../../x86_64-pc-linux-gnu/bin/ld: warning: .tmp_vmlinux.kallsyms3.o: missing .note.GNU-stack section implies executable stack
/usr/lib/gcc/x86_64-pc-linux-gnu/12/../../../../x86_64-pc-linux-gnu/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
/usr/lib/gcc/x86_64-pc-linux-gnu/12/../../../../x86_64-pc-linux-gnu/bin/ld: warning: vmlinux has a LOAD segment with RWX permissions
Reviewed-by: David Gow <davidgow@google.com>
Signed-off-by: Peter Foley <pefoley2@pefoley.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index ae321282dc6f6..d37cac5d9f430 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -141,11 +141,10 @@ ifeq ($(CONFIG_LD_IS_BFD),y) LDFLAGS_EXECSTACK += $(call ld-option,--no-warn-rwx-segments) endif -LD_FLAGS_CMDLINE = $(foreach opt,$(KBUILD_LDFLAGS),-Wl,$(opt)) +LD_FLAGS_CMDLINE = $(foreach opt,$(KBUILD_LDFLAGS) $(LDFLAGS_EXECSTACK),-Wl,$(opt)) # Used by link-vmlinux.sh which has special support for um link export CFLAGS_vmlinux := $(LINK-y) $(LINK_WRAPS) $(LD_FLAGS_CMDLINE) -export LDFLAGS_vmlinux := $(LDFLAGS_EXECSTACK) # When cleaning we don't include .config, so we don't include # TT or skas makefiles and don't clean skas_ptregs.h. |