summaryrefslogtreecommitdiffstats
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2020-07-27 21:58:45 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2020-07-27 21:58:45 +0200
commit154bc2aa3cb51104bdf213463da4fef9866c5a7b (patch)
tree8bb9449a8ad35a3c72a0d3de481a2c1c3c01d257 /arch/arm/Makefile
parent8b0bf1ee077715ceb0535fbda799038ea62baef8 (diff)
parentc55d8cbfc9447f32cb0d880e23c42d4ad185fae5 (diff)
downloadbarebox-154bc2aa3cb51104bdf213463da4fef9866c5a7b.tar.gz
barebox-154bc2aa3cb51104bdf213463da4fef9866c5a7b.tar.xz
Merge branch 'for-next/module'
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r--arch/arm/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 46dfe1f62a..96613cc5ba 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -16,6 +16,10 @@ KBUILD_CPPFLAGS += -mlittle-endian
LD += -EL
endif
+ifeq ($(CONFIG_ARM_MODULE_PLTS),y)
+LDFLAGS_MODULE += -T $(srctree)/arch/arm/lib32/module.lds
+endif
+
# Unaligned access is not supported when MMU is disabled, so given how
# at least some of the code would be executed with MMU off, lets be
# conservative and instruct the compiler not to generate any unaligned
@@ -137,7 +141,7 @@ LDFLAGS_barebox += --gc-sections
LDFLAGS_pbl += --gc-sections
# early code often runs at addresses we are not linked at
-KBUILD_CPPFLAGS += -fPIE
+KBUILD_CFLAGS_KERNEL += -fPIE
ifdef CONFIG_RELOCATABLE
LDFLAGS_barebox += -pie