Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-02-10 08:30:41 +00:00
Code Issues Projects Releases Wiki Activity

build system: add PIE build option

Browse Source
This commit is contained in:
Denis Vlasenko 2008-06-04 11:28:24 +00:00
parent 1e93f3c585
commit 1da86d2f40
5 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Config.in
View File

@ -262,6 +262,14 @@ config STATIC
Most people will leave this set to 'N'. Most people will leave this set to 'N'.
config PIE
bool "Build BusyBox as a position independent executable"
default n
depends on !STATIC
help
(TODO: what is it and why/when is it useful?)
Most people will leave this set to 'N'.
config NOMMU config NOMMU
bool "Force NOMMU build" bool "Force NOMMU build"
default n default n

4
Makefile
View File

@ -315,6 +315,8 @@ AFLAGS_KERNEL =
# Use LINUXINCLUDE when you must reference the include/ directory. # Use LINUXINCLUDE when you must reference the include/ directory.
# Needed to be compatible with the O= option # Needed to be compatible with the O= option
CFLAGS := $(CFLAGS) CFLAGS := $(CFLAGS)
# Added only to final link stage of busybox binary
CFLAGS_busybox := $(CFLAGS_busybox)
CPPFLAGS := $(CPPFLAGS) CPPFLAGS := $(CPPFLAGS)
AFLAGS := $(AFLAGS) AFLAGS := $(AFLAGS)
LDFLAGS := $(LDFLAGS) LDFLAGS := $(LDFLAGS)
@ -580,7 +582,7 @@ quiet_cmd_busybox__ ?= LINK $@
cmd_busybox__ ?= $(srctree)/scripts/trylink \ cmd_busybox__ ?= $(srctree)/scripts/trylink \
"$@" \ "$@" \
"$(CC)" \ "$(CC)" \
"$(CFLAGS)" \ "$(CFLAGS) $(CFLAGS_busybox)" \
"$(LDFLAGS) $(EXTRA_LDFLAGS)" \ "$(LDFLAGS) $(EXTRA_LDFLAGS)" \
"$(core-y)" \ "$(core-y)" \
"$(libs-y)" \ "$(libs-y)" \

20
Makefile.flags
View File

@ -50,17 +50,31 @@ ifeq ($(CONFIG_DEBUG),y)
CFLAGS += $(call cc-option,-g) CFLAGS += $(call cc-option,-g)
endif endif
# If arch/$(ARCH)/Makefile did not override it (with, say, -fPIC)...
ARCH_FPIC ?= -fpic
ARCH_FPIE ?= -fpie
ARCH_PIE ?= -pie
ifeq ($(CONFIG_BUILD_LIBBUSYBOX),y) ifeq ($(CONFIG_BUILD_LIBBUSYBOX),y)
# on i386: 14% smaller libbusybox.so # on i386: 14% smaller libbusybox.so
# (code itself is 9% bigger, we save on relocs/PLT/GOT) # (code itself is 9% bigger, we save on relocs/PLT/GOT)
CFLAGS += -fpic CFLAGS += $(ARCH_FPIC)
# and another 4% reduction of libbusybox.so: # and another 4% reduction of libbusybox.so:
# (external entry points must be marked EXTERNALLY_VISIBLE) # (external entry points must be marked EXTERNALLY_VISIBLE)
CFLAGS += $(call cc-option,-fvisibility=hidden) CFLAGS += $(call cc-option,-fvisibility=hidden)
endif endif
ifeq ($(CONFIG_STATIC),y) ifeq ($(CONFIG_STATIC),y)
LDFLAGS += -static CFLAGS_busybox += -static
endif
ifeq ($(CONFIG_PIE),y)
CFLAGS_busybox += $(ARCH_PIE)
CFLAGS += $(ARCH_FPIE)
# No switch() jump tables. Code growth +1k, binary size down -12k
# due to reduced number of code pointers.
# (TODO: make overridable: some arches may want to not do this)
CFLAGS += $(call cc-option,-fno-jump-tables)
endif endif
LDLIBS += m crypt LDLIBS += m crypt
@ -81,8 +95,6 @@ ifeq ($(CONFIG_DMALLOC),y)
LDLIBS += dmalloc LDLIBS += dmalloc
endif endif
#LDFLAGS += -nostdlib
LDFLAGS_ELF2FLT = -Wl,-elf2flt LDFLAGS_ELF2FLT = -Wl,-elf2flt
ifneq (,$(findstring $(LDFLAGS_ELF2FLT),$(LDFLAGS))) ifneq (,$(findstring $(LDFLAGS_ELF2FLT),$(LDFLAGS)))
SKIP_STRIP = y SKIP_STRIP = y

2
scripts/Makefile.IMA
View File

@ -180,7 +180,7 @@ busybox_unstripped.o: $(usage_stuff) include/applet_tables.h include/autoconf.h
busybox: busybox_unstripped.o busybox: busybox_unstripped.o
$(srctree)/scripts/trylink \ $(srctree)/scripts/trylink \
busybox_unstripped \ busybox_unstripped \
"$(CC)" \ "$(CC) $(CFLAGS_busybox)" \
"$(CFLAGS)" \ "$(CFLAGS)" \
"$(LDFLAGS)" \ "$(LDFLAGS)" \
"busybox_unstripped.o" \ "busybox_unstripped.o" \