aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2020-03-05 16:56:18 +0100
committerJames Cameron <quozl@laptop.org>2020-03-12 14:17:55 +1100
commitf68d3df850130846d0f7f2d944d6edc2df82611f (patch)
treeb0460864f18a17d5dacb373499e57f49aeacf3e4
parent10c67e4f24844cf02ad501460c7ad3a9aa566a2d (diff)
downloadopenfirmware-f68d3df850130846d0f7f2d944d6edc2df82611f.tar.gz
build: turn off PIE by default
Some compilers (e.g. Debian) now turn PIE on by default. It makes no sense for use, and the inclusion of .got table confuses our tooling.
-rw-r--r--clients/emacs/arm/Makefile2
-rw-r--r--clients/lib/arm/makefile2
-rw-r--r--cpu/arm/olpc/build-mcnand.fth2
3 files changed, 3 insertions, 3 deletions
diff --git a/clients/emacs/arm/Makefile b/clients/emacs/arm/Makefile
index 1231f3df..d6ea96fb 100644
--- a/clients/emacs/arm/Makefile
+++ b/clients/emacs/arm/Makefile
@@ -24,7 +24,7 @@ LIBDIR=$(HLIBDIR)/arm
GLIBDIR=$(dir $(shell $(CC) -print-libgcc-file-name))
INCS=-I. -I$(SRCDIR) -I$(HLIBDIR)
-MODES=-g -O2 -fno-inline
+MODES=-g -O2 -fno-inline -fno-pie
CFLAGS= $(INCS) $(MODES)
CFLAGS += -Wno-implicit-function-declaration
CFLAGS += -Wno-implicit-int
diff --git a/clients/lib/arm/makefile b/clients/lib/arm/makefile
index 87a2dc69..d9888c7e 100644
--- a/clients/lib/arm/makefile
+++ b/clients/lib/arm/makefile
@@ -13,7 +13,7 @@ else
CC := gcc
endif
-CFLAGS = -I.. -O2 -mcpu=strongarm110 -fno-builtin
+CFLAGS = -I.. -O2 -mcpu=strongarm110 -fno-builtin -fno-pie
ifeq (y, $(shell $(CC) -xc -c -fno-stack-protector /dev/null -o /dev/null 2>/dev/null && echo y))
CFLAGS += -fno-stack-protector
endif
diff --git a/cpu/arm/olpc/build-mcnand.fth b/cpu/arm/olpc/build-mcnand.fth
index c5d579fc..52f64a81 100644
--- a/cpu/arm/olpc/build-mcnand.fth
+++ b/cpu/arm/olpc/build-mcnand.fth
@@ -12,7 +12,7 @@ purpose: Common code for fetching and building the NANDblaster support code
" mv multicast-nand-${MCNAND_VERSION} multicast-nand" expand$ $sh
[then]
-" (cd multicast-nand; make BPDIR=../../../../../.. OFW_CPU=arm CC_OFW=${CROSS}gcc LD_OFW=${CROSS}ld STRIP_OFW=${CROSS}strip nandblaster15_rx.bin nandblaster_tx.bin; cp nandblaster15_rx.bin nandblaster_tx.bin ..)" expand$ $sh
+" (cd multicast-nand; make BPDIR=../../../../../.. OFW_CPU=arm CC_OFW=${CROSS}gcc LD_OFW=${CROSS}ld STRIP_OFW=${CROSS}strip CPU_CFLAGS=-fno-pie nandblaster15_rx.bin nandblaster_tx.bin; cp nandblaster15_rx.bin nandblaster_tx.bin ..)" expand$ $sh
\ This forces the creation of a .log file, so we don't re-fetch
writing mcastnand.version