From 343f6b8f1f754e397632b0552e4afe586c8b392b Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 28 Jan 2015 10:50:34 +0100 Subject: buildsys: fix IS_IN_lib* for out-of-tree builds 41537a770b46f2376e74af58ba4885749339e81e erroneously stripped the top_builddir off the per-directory flag setting which works fine for in-tree builds but is not correct for O= Just use the full path of the target files to apply the flags to fix that thinko. Signed-off-by: Bernhard Reutner-Fischer --- Makerules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makerules b/Makerules index 85f21ea1a..87e3c19ee 100644 --- a/Makerules +++ b/Makerules @@ -29,7 +29,7 @@ objs: all_objs # apply unconditional per-directory flags define add_IS_IN_lib ifneq ($(strip $(2)),) -__add_IS_IN_lib := $(subst $(top_builddir),,$(2)) +__add_IS_IN_lib := $(2) $$(__add_IS_IN_lib): CFLAGS-for-library-members:=$(CFLAGS-$(1)) -DIN_LIB=$(word 1,$(subst /, ,$(1))) endif endef -- cgit v1.2.3 From 673c426bfbe58ee626d346b13365b73712f961ba Mon Sep 17 00:00:00 2001 From: Steve Ellcey Date: Wed, 28 Jan 2015 14:56:07 -0800 Subject: Update MIPS configuration rules. Add a configuration choice for the NaN format on MIPS (either the standard (legacy) format or the newer IEEE 2008 format. Change how CPU_LDFLAGS are set for MIPS. Use the same value as CPU_CFLAGS since CC is used to do linking. This ensures consistency between compiles and links and adds support for N32 ABI to linking. Signed-off-by: Steve Ellcey Signed-off-by: Bernhard Reutner-Fischer --- Rules.mak | 13 +++++-------- extra/Configs/Config.mips | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Rules.mak b/Rules.mak index 202f31ff6..9f5fe8564 100644 --- a/Rules.mak +++ b/Rules.mak @@ -412,17 +412,14 @@ ifeq ($(TARGET_ARCH),mips) CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS32R2)+=-march=mips32r2 -mtune=mips32r2 CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS64)+=-mips64 -mtune=mips32 CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS64R2)+=-mips64r2 -mtune=mips64r2 - ifeq ($(strip $(ARCH_BIG_ENDIAN)),y) - CPU_LDFLAGS-$(CONFIG_MIPS_N64_ABI)+=-Wl,-melf64btsmip - CPU_LDFLAGS-$(CONFIG_MIPS_O32_ABI)+=-Wl,-melf32btsmip - endif - ifeq ($(strip $(ARCH_LITTLE_ENDIAN)),y) - CPU_LDFLAGS-$(CONFIG_MIPS_N64_ABI)+=-Wl,-melf64ltsmip - CPU_LDFLAGS-$(CONFIG_MIPS_O32_ABI)+=-Wl,-melf32ltsmip - endif CPU_CFLAGS-$(CONFIG_MIPS_N64_ABI)+=-mabi=64 CPU_CFLAGS-$(CONFIG_MIPS_O32_ABI)+=-mabi=32 CPU_CFLAGS-$(CONFIG_MIPS_N32_ABI)+=-mabi=n32 + + CPU_CFLAGS-$(CONFIG_MIPS_NAN_LEGACY)+=-mnan=legacy + CPU_CFLAGS-$(CONFIG_MIPS_NAN_2008)+=-mnan=2008 + + CPU_LDFLAGS-y += $(CPU_CFLAGS) endif ifeq ($(TARGET_ARCH),nios) diff --git a/extra/Configs/Config.mips b/extra/Configs/Config.mips index 4d30d31d2..76b10c662 100644 --- a/extra/Configs/Config.mips +++ b/extra/Configs/Config.mips @@ -32,6 +32,21 @@ config CONFIG_MIPS_N64_ABI endchoice +choice + prompt "Target NAN Encoding" + default CONFIG_MIPS_NAN_LEGACY + help + This is the NAN Encoding you want to use. Chose either Legacy + or 2008. + +config CONFIG_MIPS_NAN_LEGACY + bool "LEGACY" + +config CONFIG_MIPS_NAN_2008 + bool "2008" + +endchoice + choice prompt "Target Processor Architecture" default CONFIG_MIPS_ISA_1 if CONFIG_MIPS_O32_ABI -- cgit v1.2.3