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 | f6b57149af3edf52773f9c3abf5e5e0454bcb49c (patch) | |
| tree | 7606e2550f2bb769a33e8f7f3dae3546c6146603 | |
| parent | 08a62d8d8a355e9589106309926a18ffb92a9761 (diff) | |
| download | mtk-20170518-f6b57149af3edf52773f9c3abf5e5e0454bcb49c.zip mtk-20170518-f6b57149af3edf52773f9c3abf5e5e0454bcb49c.tar.gz mtk-20170518-f6b57149af3edf52773f9c3abf5e5e0454bcb49c.tar.bz2 | |
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>
SVN-Revision: 38943
| -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 0f3145d..eca218e 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 45d32bd..96168a3 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 da729dd..2041ffc 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) |