~sircmpwn/linux

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-07-07 10:51:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-07-07 10:51:25 -0700
commit43b6b6eca863cf2f83dc062484963377c66a72be (patch)
tree63f56c7fc22b37e3a078514491b9db6d48fe1bd8
parent624434af256a86b74b857f78b7c0d4a11b7dcb6c (diff)
parent1a381d4a0a9a0f999a13faaba22bf6b3fc80dcb9 (diff)
downloadlinux-43b6b6eca863cf2f83dc062484963377c66a72be.tar.xz
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 LDFLAGS clean-up from Catalin Marinas: - use aarch64elf instead of aarch64linux - move endianness options to LDFLAGS instead from LD - remove no-op '-p' linker flag * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: remove no-op -p linker flag arm64: add endianness option to LDFLAGS instead of LD arm64: Use aarch64elf and aarch64elfb emulation mode variants
-rw-r--r--arch/arm64/Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index 4527226..7976d2d 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -10,7 +10,7 @@
#
# Copyright (C) 1995-2001 by Russell King
-LDFLAGS_vmlinux :=-p --no-undefined -X
+LDFLAGS_vmlinux :=--no-undefined -X
CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET)
GZFLAGS :=-9
@@ -60,15 +60,13 @@ ifeq ($(CONFIG_CPU_BIG_ENDIAN), y)
KBUILD_CPPFLAGS += -mbig-endian
CHECKFLAGS += -D__AARCH64EB__
AS += -EB
-LD += -EB
-LDFLAGS += -maarch64linuxb
+LDFLAGS += -EB -maarch64elfb
UTS_MACHINE := aarch64_be
else
KBUILD_CPPFLAGS += -mlittle-endian
CHECKFLAGS += -D__AARCH64EL__
AS += -EL
-LD += -EL
-LDFLAGS += -maarch64linux
+LDFLAGS += -EL -maarch64elf
UTS_MACHINE := aarch64
endif