diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 11:46:31 -0800 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 11:51:37 -0800 |
| commit | f757db2d319ccc5f7034165046fb2bb58901afb1 (patch) | |
| tree | 7dc465febb3a802d3f0e8856fcda856b13b04c0a /Rules.mak | |
| parent | 76c0c0ed99f74b8a5965be6e1c6a0c0e7a72513c (diff) | |
| parent | b71274eebd68b7c68ab95c856f8075bdf4524cd7 (diff) | |
Merge remote branch 'origin/master' into nptl_merge
Conflicts:
Rules.mak
libc/misc/sysvipc/msgq.c
test/Rules.mak
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'Rules.mak')
| -rw-r--r-- | Rules.mak | 15 |
1 files changed, 11 insertions, 4 deletions
@@ -345,6 +345,7 @@ ifeq ($(TARGET_ARCH),arm) endif ifeq ($(TARGET_ARCH),mips) + OPTIMIZATIONS+=-mno-split-addresses CPU_CFLAGS-$(CONFIG_MIPS_ISA_1)+=-mips1 CPU_CFLAGS-$(CONFIG_MIPS_ISA_2)+=-mips2 -mtune=mips2 CPU_CFLAGS-$(CONFIG_MIPS_ISA_3)+=-mips3 -mtune=mips3 @@ -366,6 +367,7 @@ ifeq ($(TARGET_ARCH),mips) endif ifeq ($(TARGET_ARCH),nios) + OPTIMIZATIONS+=-funaligned-struct-hack CPU_LDFLAGS-y+=-Wl,-m32 CPU_CFLAGS-y+=-Wl,-m32 endif @@ -401,6 +403,14 @@ ifeq ($(TARGET_ARCH),h8300) CPU_CFLAGS-$(CONFIG_H8S) += -ms -mint32 endif +ifeq ($(TARGET_ARCH),i960) + OPTIMIZATIONS+=-mh -mint32 #-fsigned-char +endif + +ifeq ($(TARGET_ARCH),e1) + OPTIMIZATIONS+=-mgnu-param +endif + ifeq ($(TARGET_ARCH),cris) CPU_LDFLAGS-$(CONFIG_CRIS)+=-Wl,-mcrislinux CPU_LDFLAGS-$(CONFIG_CRISV32)+=-Wl,-mcrislinux @@ -520,9 +530,6 @@ XWARNINGS+=-Wnonnull -Wundef # Works only w/ gcc-3.4 and up, can't be checked for gcc-3.x w/ check_gcc() #XWARNINGS+=-Wdeclaration-after-statement endif -# Seems to be unused (no ARCH_CFLAGS anywhere), delete? -# if yes, remove after 0.9.31 -XARCH_CFLAGS=$(call qstrip,$(ARCH_CFLAGS)) CPU_CFLAGS=$(call qstrip,$(CPU_CFLAGS-y)) SSP_DISABLE_FLAGS ?= $(call check_gcc,-fno-stack-protector,) @@ -582,7 +589,7 @@ LDFLAGS:=$(LDFLAGS_NOSTRIP) -Wl,-z,defs ifeq ($(DODEBUG),y) CFLAGS += -O0 -g3 -DDEBUG else -CFLAGS += $(OPTIMIZATION) $(XARCH_CFLAGS) -DNDEBUG +CFLAGS += $(OPTIMIZATION) endif ifeq ($(DOSTRIP),y) LDFLAGS += -Wl,-s |