diff options
| -rw-r--r-- | libm/Makefile.in | 11 | ||||
| -rw-r--r-- | libm/powerpc/classic/Makefile.arch | 4 | ||||
| -rw-r--r-- | libm/powerpc/e500/Makefile.arch | 1 |
3 files changed, 3 insertions, 13 deletions
diff --git a/libm/Makefile.in b/libm/Makefile.in index a0b247981..384365cac 100644 --- a/libm/Makefile.in +++ b/libm/Makefile.in @@ -34,15 +34,8 @@ libm_FULL_NAME := libm-$(VERSION).so libm_DIR:=$(top_srcdir)libm libm_OUT:=$(top_builddir)libm -# Fix builds for powerpc as there are different cores in this -# section now.` -ifeq ($(TARGET_ARCH)-$(CONFIG_E500),powerpc-y) -libm_ARCH_DIR:=$(libm_DIR)/$(TARGET_ARCH)/e500 -libm_ARCH_OUT:=$(libm_OUT)/$(TARGET_ARCH)/e500 -else 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) @@ -225,12 +218,8 @@ endif ifeq ($(UCLIBC_HAS_FPU),y) ifeq ($(DO_C99_MATH),y) ifneq ($(strip $(libm_ARCH_OBJS)),) -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 ifneq ($(strip $(libm_ARCH_SRC)),) diff --git a/libm/powerpc/classic/Makefile.arch b/libm/powerpc/classic/Makefile.arch index 7c7600f80..53c6d2cac 100644 --- a/libm/powerpc/classic/Makefile.arch +++ b/libm/powerpc/classic/Makefile.arch @@ -5,8 +5,8 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -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)) libm_ARCH_OBJS:=$(libm_ARCH_OBJ) diff --git a/libm/powerpc/e500/Makefile.arch b/libm/powerpc/e500/Makefile.arch index bec21caef..912ce7f10 100644 --- a/libm/powerpc/e500/Makefile.arch +++ b/libm/powerpc/e500/Makefile.arch @@ -5,5 +5,6 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # +libm_ARCH_fpu_DIR := $(libm_SUBARCH_DIR)/fpu -include $(libm_ARCH_fpu_DIR)/Makefile.arch |