16 Feb
2015
16 Feb
'15
5:41 a.m.
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, master has been updated
via 2e6fa2c249c4cd6ada59de0793fb29438feb76eb (commit)
via 673c426bfbe58ee626d346b13365b73712f961ba (commit)
via 343f6b8f1f754e397632b0552e4afe586c8b392b (commit)
from f2267227fd6f88f3abc85bfa0db3b19178c46460 (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 2e6fa2c249c4cd6ada59de0793fb29438feb76eb
Merge: f226722 673c426
Author: Waldemar Brodkorb <wbx(a)openadk.org>
Date: Sun Feb 15 23:46:52 2015 -0600
merge uClibc changes
-----------------------------------------------------------------------
Summary of changes:
Makerules | 2 +-
Rules.mak | 5 +++++
extra/Configs/Config.mips | 15 +++++++++++++++
3 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/Makerules b/Makerules
index d6a1864..6e2af48 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 a95fdd8..7688c72 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -410,6 +410,11 @@ ifeq ($(TARGET_ARCH),mips)
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),sh)
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