diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2016-07-12 17:28:01 +0200 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2016-07-19 16:30:23 +0200 |
| commit | f8fa70f392fab8697b6358bb7e4f8c3e8429ec7b (patch) | |
| tree | 4465e46c9ec93dedf7c88a63cf9d4b4b50fc2f66 /arch/arm64 | |
| parent | arm64: ptrace: remove extra define for CPSR's E bit (diff) | |
| download | linux-f8fa70f392fab8697b6358bb7e4f8c3e8429ec7b.tar.xz linux-f8fa70f392fab8697b6358bb7e4f8c3e8429ec7b.zip | |
arm64: localise Image objcopy flags
We currently define OBJCOPYFLAGS in the top-level arm64 Makefile, and
thus these flags will be passed to all uses of objcopy, kernel-wide, for
which they are not explicitly overridden. The flags we set are intended
for converting vmlinux (and ELF) into Image (a raw binary), and thus the
flags chosen are problematic for some other uses which do not expect a
raw binary result, e.g. the upcoming lkdtm rodata test:
http://www.openwall.com/lists/kernel-hardening/2016/06/08/2
This patch localises the objcopy flags such that they are only used for
the vmlinux -> Image conversion.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Acked-by: Kees Cook <keescook@chromium.org>
Tested-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm64/boot/Makefile | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 4b6f84bf2ab9..393103b8abe4 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -12,7 +12,6 @@ LDFLAGS_vmlinux :=-p --no-undefined -X CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET) -OBJCOPYFLAGS :=-O binary -R .note -R .note.gnu.build-id -R .comment -S GZFLAGS :=-9 ifneq ($(CONFIG_RELOCATABLE),) diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile index 305c552b5ec1..1f012c506434 100644 --- a/arch/arm64/boot/Makefile +++ b/arch/arm64/boot/Makefile @@ -14,6 +14,8 @@ # Based on the ia64 boot/Makefile. # +OBJCOPYFLAGS_Image :=-O binary -R .note -R .note.gnu.build-id -R .comment -S + targets := Image Image.gz $(obj)/Image: vmlinux FORCE |