Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43b6b6ec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 624434af 1a381d4a

arch/arm64/Makefile

+3 −5
Original line number Diff line number Diff line
@@ -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