4 files changed, 5 insertions, 7 deletions
diff --git a/libm/Makefile.in b/libm/Makefile.in
index c232d9182..e4df83b48 100644
--- a/libm/Makefile.in
+++ b/libm/Makefile.in
@@ -42,9 +42,6 @@ libm_ARCH_DIR:=$(libm_DIR)/$(TARGET_ARCH)
 libm_ARCH_OUT:=$(libm_OUT)/$(TARGET_ARCH)
 endif
 
-libm_ARCH_fpu_DIR:=$(libm_ARCH_DIR)/fpu
-libm_ARCH_fpu_OUT:=$(libm_ARCH_OUT)/fpu
-
 ifeq ($(UCLIBC_HAS_FPU),y)
 ifeq ($(DO_C99_MATH),y)
 -include $(libm_ARCH_DIR)/Makefile.arch
diff --git a/libm/sh/Makefile.arch b/libm/sh/Makefile.arch
index e0f4fe952..6425b3ede 100644
--- a/libm/sh/Makefile.arch
+++ b/libm/sh/Makefile.arch
@@ -5,8 +5,10 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-libm_ARCH_SRC:=$(wildcard $(libm_ARCH_fpu_DIR)/*.c)
-libm_ARCH_OBJ:=$(patsubst $(libm_ARCH_fpu_DIR)/%.c,$(libm_ARCH_fpu_OUT)/%.o,$(libm_ARCH_SRC))
+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))
+endif
 
 libm_ARCH_OBJS:=$(libm_ARCH_OBJ)
 
@@ -16,3 +18,4 @@ else
 libm-a-y+=$(libm_ARCH_OBJS)
 endif
 libm-so-y+=$(libm_ARCH_OBJS:.o=.os)
+
diff --git a/libm/sh/feholdexcpt.c b/libm/sh/feholdexcpt.c
index 1af79b31f..70b51e8dd 100644
--- a/libm/sh/feholdexcpt.c
+++ b/libm/sh/feholdexcpt.c
@@ -27,4 +27,3 @@ feholdexcept (fenv_t *envp)
 
   return 1;
 }
-libm_hidden_def (feholdexcept)
diff --git a/libm/sh/fesetenv.c b/libm/sh/fesetenv.c
index 9f9082cf3..c5cfc1d51 100644
--- a/libm/sh/fesetenv.c
+++ b/libm/sh/fesetenv.c
@@ -24,4 +24,3 @@ fesetenv (const fenv_t *envp)
     }
   return 0;
 }
-libm_hidden_def (fesetenv)