diff options
| author | Graeme Russ <graeme.russ@gmail.com> | 2011-02-12 15:11:21 +1100 |
|---|---|---|
| committer | Graeme Russ <graeme.russ@gmail.com> | 2011-02-12 15:11:21 +1100 |
| commit | a85f53cd3fb2d24231808994dafe43023b3ce6d4 (patch) | |
| tree | b1a3fb71b83d26ea2fa099f834a97647bbd57997 | |
| parent | de47cbe6860654cc6c0cf8820d9165f059c7cf38 (diff) | |
x86: Align config.mk and linker scripts with other arches
| -rw-r--r-- | arch/i386/config.mk | 14 | ||||
| -rw-r--r-- | arch/i386/cpu/config.mk | 4 | ||||
| -rw-r--r-- | arch/i386/cpu/u-boot.lds (renamed from board/eNET/u-boot.lds) | 0 | ||||
| -rw-r--r-- | board/eNET/config.mk | 4 |
4 files changed, 10 insertions, 12 deletions
diff --git a/arch/i386/config.mk b/arch/i386/config.mk index 3fb97c1989..fc6a313f76 100644 --- a/arch/i386/config.mk +++ b/arch/i386/config.mk @@ -21,8 +21,6 @@ # MA 02111-1307 USA # -CROSS_COMPILE ?= i386-linux- - STANDALONE_LOAD_ADDR = 0x40000 PLATFORM_CPPFLAGS += -fno-strict-aliasing @@ -33,8 +31,12 @@ PLATFORM_CPPFLAGS += $(call cc-option, -ffreestanding) PLATFORM_CPPFLAGS += $(call cc-option, -fno-toplevel-reorder, $(call cc-option, -fno-unit-at-a-time)) PLATFORM_CPPFLAGS += $(call cc-option, -fno-stack-protector) PLATFORM_CPPFLAGS += $(call cc-option, -mpreferred-stack-boundary=2) -PLATFORM_CPPFLAGS += -DCONFIG_I386 -D__I386__ +PLATFORM_CPPFLAGS += -fno-dwarf2-cfi-asm + +PLATFORM_RELFLAGS += -ffunction-sections -fvisibility=hidden + +PLATFORM_LDFLAGS += --emit-relocs -Bsymbolic -Bsymbolic-functions + +LDFLAGS_u-boot += --gc-sections -pie +LDSCRIPT := $(SRCTREE)/$(CPUDIR)/u-boot.lds -LDFLAGS += --cref -LDFLAGS_u-boot += --gc-sections -PLATFORM_RELFLAGS += -ffunction-sections diff --git a/arch/i386/cpu/config.mk b/arch/i386/cpu/config.mk index 16a160d2f3..ec1d102762 100644 --- a/arch/i386/cpu/config.mk +++ b/arch/i386/cpu/config.mk @@ -21,6 +21,6 @@ # MA 02111-1307 USA # -PLATFORM_RELFLAGS += +CROSS_COMPILE ?= i386-linux- -PLATFORM_CPPFLAGS += -march=i386 -Werror +PLATFORM_CPPFLAGS += -DCONFIG_I386 -D__I386__ -march=i386 -Werror diff --git a/board/eNET/u-boot.lds b/arch/i386/cpu/u-boot.lds index 3eeb2a201b..3eeb2a201b 100644 --- a/board/eNET/u-boot.lds +++ b/arch/i386/cpu/u-boot.lds diff --git a/board/eNET/config.mk b/board/eNET/config.mk index c4242add17..ce575aba0f 100644 --- a/board/eNET/config.mk +++ b/board/eNET/config.mk @@ -22,7 +22,3 @@ # CONFIG_SYS_TEXT_BASE = 0x06000000 -CFLAGS_common/dlmalloc.o += -Wa,--no-warn -fno-strict-aliasing -PLATFORM_RELFLAGS += -fvisibility=hidden -PLATFORM_CPPFLAGS += -fno-dwarf2-cfi-asm -PLATFORM_LDFLAGS += -pic --emit-relocs -Bsymbolic -Bsymbolic-functions |