diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2013-11-29 10:59:51 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2013-11-29 10:59:51 +0000 |
| commit | 0fdebf9347b15a6e24f2ea0afa1eeb4067bec4de (patch) | |
| tree | b82c67596a543545aa3bdd656a90c4eeb8fd7d48 | |
| parent | 5f6881f7e2cdffd5a12c514c6640e8f8baa7295a (diff) | |
| download | upstream-0fdebf9347b15a6e24f2ea0afa1eeb4067bec4de.tar.gz upstream-0fdebf9347b15a6e24f2ea0afa1eeb4067bec4de.tar.bz2 upstream-0fdebf9347b15a6e24f2ea0afa1eeb4067bec4de.zip | |
FPU type should not interfere with the ABI selection.
Also make sure we either do real soft-float or hard-float on ARM, with the right options.
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38943 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/target.mk | 4 | ||||
| -rw-r--r-- | package/boot/uboot-omap/Makefile | 2 | ||||
| -rw-r--r-- | package/boot/uboot-sunxi/Makefile | 2 | ||||
| -rw-r--r-- | rules.mk | 9 |
4 files changed, 12 insertions, 5 deletions
diff --git a/include/target.mk b/include/target.mk index 0f3145df59..eca218e0b3 100644 --- a/include/target.mk +++ b/include/target.mk @@ -232,8 +232,8 @@ ifeq ($(DUMP),1) CPU_CFLAGS_mpcore = -march=armv6k -mtune=mpcore CPU_CFLAGS_xscale = -march=armv5te -mtune=xscale ifneq ($(CONFIG_SOFT_FLOAT),) - CPU_CFLAGS_vfp = -mfpu=vfp -mfloat-abi=softfp - CPU_CFLAGS_vfpv3 = -mfpu=vfpv3-d16 -mfloat-abi=softfp + CPU_CFLAGS_vfp = -mfpu=vfp + CPU_CFLAGS_vfpv3 = -mfpu=vfpv3-d16 endif endif ifeq ($(ARCH),powerpc) diff --git a/package/boot/uboot-omap/Makefile b/package/boot/uboot-omap/Makefile index 45d32bd3c3..96168a30d0 100644 --- a/package/boot/uboot-omap/Makefile +++ b/package/boot/uboot-omap/Makefile @@ -71,7 +71,7 @@ endif define Build/Configure $(MAKE) -C $(PKG_BUILD_DIR) \ - $(UBOOT_CONFIG)_config + USE_PRIVATE_LIBGCC=yes $(UBOOT_CONFIG)_config endef define Build/Compile diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile index da729dd969..2041ffc4be 100644 --- a/package/boot/uboot-sunxi/Makefile +++ b/package/boot/uboot-sunxi/Makefile @@ -73,7 +73,7 @@ endif define Build/Configure $(MAKE) -C $(PKG_BUILD_DIR) \ - $(UBOOT_CONFIG)_config + USE_PRIVATE_LIBGCC=yes $(UBOOT_CONFIG)_config endef define Build/Compile @@ -168,9 +168,16 @@ TARGET_PATH_PKG:=$(STAGING_DIR)/host/bin:$(TARGET_PATH) ifeq ($(CONFIG_SOFT_FLOAT),y) SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft - TARGET_CFLAGS+= -msoft-float + ifeq ($(CONFIG_arm),y) + TARGET_CFLAGS+= -mfloat-abi=soft + else + TARGET_CFLAGS+= -msoft-float + endif else SOFT_FLOAT_CONFIG_OPTION:= + ifeq ($(CONFIG_arm),y) + TARGET_CFLAGS+= -mfloat-abi=hard + endif endif export PATH:=$(TARGET_PATH) |