KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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.

Browse source 
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 38943
This commit is contained in:
Imre Kaloz 2013-11-29 10:59:51 +00:00
parent 08a62d8d8a
commit f6b57149af
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/target.mk
View file

@ -232,8 +232,8 @@ ifeq ($(DUMP),1)
CPU_CFLAGS_mpcore = -march=armv6k -mtune=mpcore CPU_CFLAGS_mpcore = -march=armv6k -mtune=mpcore
CPU_CFLAGS_xscale = -march=armv5te -mtune=xscale CPU_CFLAGS_xscale = -march=armv5te -mtune=xscale
ifneq ($(CONFIG_SOFT_FLOAT),) ifneq ($(CONFIG_SOFT_FLOAT),)
CPU_CFLAGS_vfp = -mfpu=vfp -mfloat-abi=softfp CPU_CFLAGS_vfp = -mfpu=vfp
CPU_CFLAGS_vfpv3 = -mfpu=vfpv3-d16 -mfloat-abi=softfp CPU_CFLAGS_vfpv3 = -mfpu=vfpv3-d16
endif endif
endif endif
ifeq ($(ARCH),powerpc) ifeq ($(ARCH),powerpc)

2
package/boot/uboot-omap/Makefile
View file

@ -71,7 +71,7 @@ endif
define Build/Configure define Build/Configure
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
$(UBOOT_CONFIG)_config USE_PRIVATE_LIBGCC=yes $(UBOOT_CONFIG)_config
endef endef
define Build/Compile define Build/Compile

2
package/boot/uboot-sunxi/Makefile
View file

@ -73,7 +73,7 @@ endif
define Build/Configure define Build/Configure
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
$(UBOOT_CONFIG)_config USE_PRIVATE_LIBGCC=yes $(UBOOT_CONFIG)_config
endef endef
define Build/Compile define Build/Compile

9
rules.mk
View file

@ -168,9 +168,16 @@ TARGET_PATH_PKG:=$(STAGING_DIR)/host/bin:$(TARGET_PATH)
ifeq ($(CONFIG_SOFT_FLOAT),y) ifeq ($(CONFIG_SOFT_FLOAT),y)
SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft 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 else
SOFT_FLOAT_CONFIG_OPTION:= SOFT_FLOAT_CONFIG_OPTION:=
ifeq ($(CONFIG_arm),y)
TARGET_CFLAGS+= -mfloat-abi=hard
endif
endif endif
export PATH:=$(TARGET_PATH) export PATH:=$(TARGET_PATH)