This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The branch, 1.0 has been updated via 42e9e0a0406473a9b017342eaffc03c85f9bb51b (commit) via 673c426bfbe58ee626d346b13365b73712f961ba (commit) via 343f6b8f1f754e397632b0552e4afe586c8b392b (commit) from 6007a0d8e829c5f6ff79034c3101c214766dc3d2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 42e9e0a0406473a9b017342eaffc03c85f9bb51b Merge: 6007a0d 673c426 Author: Waldemar Brodkorb <wbx@openadk.org> Date: Sun Feb 15 23:54:56 2015 -0600 merge uClibc upstream changes ----------------------------------------------------------------------- Summary of changes: Makerules | 2 +- Rules.mak | 13 +++++-------- extra/Configs/Config.mips | 15 +++++++++++++++ 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Makerules b/Makerules index 85f21ea..87e3c19 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 diff --git a/Rules.mak b/Rules.mak index 2a73d7f..77c34f8 100644 --- a/Rules.mak +++ b/Rules.mak @@ -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 4d30d31..76b10c6 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 hooks/post-receive -- uClibc-ng - small C library for embedded systems