diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-03-09 08:30:24 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-03-09 08:30:24 +0100 |
commit | ac81a0d8768d75484212b208b6c42f6d11241c16 (patch) | |
tree | de3cf7aef1dd7892eb17c4a2e998a48b1be39df2 /arch/arm/Makefile | |
parent | c3efa8470b3addb3cfbcfbf2a2be1ed799489623 (diff) | |
parent | 7033089ddf4c62fa2cfd4549d2bbfe0c101c65d1 (diff) | |
download | barebox-ac81a0d8768d75484212b208b6c42f6d11241c16.tar.gz barebox-ac81a0d8768d75484212b208b6c42f6d11241c16.tar.xz |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r-- | arch/arm/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index c10d471884..96c9f5797e 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -105,10 +105,12 @@ CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) # Add cleanup flags CPPFLAGS += -fdata-sections -ffunction-sections -LDFLAGS_barebox += -static --gc-sections +LDFLAGS_barebox += --gc-sections ifdef CONFIG_RELOCATABLE LDFLAGS_barebox += -pie +else +LDFLAGS_barebox += -static endif ifdef CONFIG_IMAGE_COMPRESSION |