diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-15 23:54:56 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-15 23:54:56 -0600 |
| commit | 42e9e0a0406473a9b017342eaffc03c85f9bb51b (patch) | |
| tree | 6be5142b3c75cbdb598ff777e8d52ad4bff895da | |
| parent | 6007a0d8e829c5f6ff79034c3101c214766dc3d2 (diff) | |
| parent | 673c426bfbe58ee626d346b13365b73712f961ba (diff) | |
merge uClibc upstream changes
| -rw-r--r-- | Makerules | 2 | ||||
| -rw-r--r-- | Rules.mak | 13 | ||||
| -rw-r--r-- | extra/Configs/Config.mips | 15 |
3 files changed, 21 insertions, 9 deletions
@@ -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 @@ -401,17 +401,14 @@ endif ifeq ($(TARGET_ARCH),mips) OPTIMIZATION+=-mno-split-addresses - 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 @@ -33,6 +33,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 default CONFIG_MIPS_ISA_3 if CONFIG_MIPS_N32_ABI |