16 Feb
2015
16 Feb
'15
5:38 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, upstream has been updated
via 673c426bfbe58ee626d346b13365b73712f961ba (commit)
via 343f6b8f1f754e397632b0552e4afe586c8b392b (commit)
from 92de8a5f6ffb1ff9f7183fd08d872aa098b75ae2 (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 673c426bfbe58ee626d346b13365b73712f961ba
Author: Steve Ellcey <sellcey(a)imgtec.com>
Date: Wed Jan 28 14:56:07 2015 -0800
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 <sellcey(a)imgtec.com>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop(a)gmail.com>
commit 343f6b8f1f754e397632b0552e4afe586c8b392b
Author: Bernhard Reutner-Fischer <rep.dot.nop(a)gmail.com>
Date: Wed Jan 28 10:50:34 2015 +0100
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 <rep.dot.nop(a)gmail.com>
-----------------------------------------------------------------------
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 202f31f..9f5fe85 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 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