[git commit master 1/1] libm_sh: Move fenv functions into sh4 sub-folder

Carmelo Amoroso carmelo.amoroso at st.com
Fri Dec 17 09:02:44 UTC 2010


commit: http://git.uclibc.org/uClibc/commit/?id=5a1453f20c9ba7023f1836bdcd5ab06963f927a1
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

Indeed fenv funxtions are SH4 specific, so move them into
an SH4 specific sub-folder.

Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.com>
---
 libm/Makefile.in                |    7 +++++++
 libm/sh/{ => sh4}/Makefile.arch |    7 ++++---
 libm/sh/{ => sh4}/feholdexcpt.c |    0
 libm/sh/{ => sh4}/fesetenv.c    |    0
 4 files changed, 11 insertions(+), 3 deletions(-)
 rename libm/sh/{ => sh4}/Makefile.arch (54%)
 rename libm/sh/{ => sh4}/feholdexcpt.c (100%)
 rename libm/sh/{ => sh4}/fesetenv.c (100%)

diff --git a/libm/Makefile.in b/libm/Makefile.in
index 6f66c56..a0b2479 100644
--- a/libm/Makefile.in
+++ b/libm/Makefile.in
@@ -44,9 +44,15 @@ libm_ARCH_DIR:=$(libm_DIR)/$(TARGET_ARCH)
 libm_ARCH_OUT:=$(libm_OUT)/$(TARGET_ARCH)
 endif
 
+ifneq ($(TARGET_SUBARCH),)
+libm_SUBARCH_DIR:=$(libm_DIR)/$(TARGET_ARCH)/$(TARGET_SUBARCH)
+libm_SUBARCH_OUT:=$(libm_OUT)/$(TARGET_ARCH)/$(TARGET_SUBARCH)
+endif
+
 ifeq ($(UCLIBC_HAS_FPU),y)
 ifeq ($(DO_C99_MATH),y)
 -include $(libm_ARCH_DIR)/Makefile.arch
+-include $(libm_SUBARCH_DIR)/Makefile.arch
 endif
 endif
 
@@ -223,6 +229,7 @@ ifeq ($(TARGET_ARCH)-$(CONFIG_E500),powerpc-y)
 CFLAGS-libm/$(TARGET_ARCH)/e500/ := $(CFLAGS-libm)
 else
 CFLAGS-libm/$(TARGET_ARCH)/ := $(CFLAGS-libm)
+CFLAGS-libm/$(TARGET_ARCH)/$(TARGET_SUBARCH)/ := $(CFLAGS-libm)
 endif
 
 # remove generic sources, if arch specific version is present
diff --git a/libm/sh/Makefile.arch b/libm/sh/sh4/Makefile.arch
similarity index 54%
rename from libm/sh/Makefile.arch
rename to libm/sh/sh4/Makefile.arch
index 6425b3e..122d84d 100644
--- a/libm/sh/Makefile.arch
+++ b/libm/sh/sh4/Makefile.arch
@@ -1,13 +1,14 @@
 # Makefile for uClibc
 #
-# Copyright (c) 2007  STMicroelectronics Ltd
+# Copyright (c) 2007, 2010  STMicroelectronics Ltd
 #
+# Author(s): Carmelo Amoroso <carmelo.amoroso at st.com>
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
 ifeq ($(UCLIBC_HAS_FENV),y)
-libm_ARCH_SRC:=$(wildcard $(libm_ARCH_DIR)/*.c)
-libm_ARCH_OBJ:=$(patsubst $(libm_ARCH_DIR)/%.c,$(libm_ARCH_OUT)/%.o,$(libm_ARCH_SRC))
+libm_ARCH_SRC:=$(wildcard $(libm_SUBARCH_DIR)/*.c)
+libm_ARCH_OBJ:=$(patsubst $(libm_SUBARCH_DIR)/%.c,$(libm_SUBARCH_OUT)/%.o,$(libm_ARCH_SRC))
 endif
 
 libm_ARCH_OBJS:=$(libm_ARCH_OBJ)
diff --git a/libm/sh/feholdexcpt.c b/libm/sh/sh4/feholdexcpt.c
similarity index 100%
rename from libm/sh/feholdexcpt.c
rename to libm/sh/sh4/feholdexcpt.c
diff --git a/libm/sh/fesetenv.c b/libm/sh/sh4/fesetenv.c
similarity index 100%
rename from libm/sh/fesetenv.c
rename to libm/sh/sh4/fesetenv.c
-- 
1.7.2.2



More information about the uClibc-cvs mailing list