Fixup SOFT_FLOAT handling
This commit is contained in:
parent
bb05a9ad46
commit
581bc450f5
@ -38,11 +38,6 @@ config BR2_SOFT_FLOAT
|
|||||||
|
|
||||||
Most people will answer N.
|
Most people will answer N.
|
||||||
|
|
||||||
config SOFT_FLOAT
|
|
||||||
string
|
|
||||||
depends on BR2_SOFT_FLOAT
|
|
||||||
default "true"
|
|
||||||
|
|
||||||
config BR2_TARGET_OPTIMIZATION
|
config BR2_TARGET_OPTIMIZATION
|
||||||
string "Target Optimizations"
|
string "Target Optimizations"
|
||||||
default "-Os -pipe"
|
default "-Os -pipe"
|
||||||
|
@ -6,7 +6,7 @@ TARGET_OPTIMIZATION:=$(strip $(subst ",, $(BR2_TARGET_OPTIMIZATION)))
|
|||||||
#""
|
#""
|
||||||
|
|
||||||
|
|
||||||
ifeq ($(SOFT_FLOAT),true)
|
ifeq ($(BR2_SOFT_FLOAT),y)
|
||||||
# gcc 3.4.x soft float configuration is different than previous versions.
|
# gcc 3.4.x soft float configuration is different than previous versions.
|
||||||
ifeq ($(findstring 3.4.,$(GCC_VERSION)),3.4.)
|
ifeq ($(findstring 3.4.,$(GCC_VERSION)),3.4.)
|
||||||
SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft
|
SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft
|
||||||
|
@ -73,7 +73,7 @@ $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked
|
|||||||
# However, we still need a patch for arm. There's a similar patch for gcc 3.3.x
|
# However, we still need a patch for arm. There's a similar patch for gcc 3.3.x
|
||||||
# which needs to be integrated so we can kill of libfloat for good, except for
|
# which needs to be integrated so we can kill of libfloat for good, except for
|
||||||
# anyone (?) who might still be using gcc 2.95. mjn3
|
# anyone (?) who might still be using gcc 2.95. mjn3
|
||||||
ifeq ($(SOFT_FLOAT),true)
|
ifeq ($(BR2_SOFT_FLOAT),y)
|
||||||
ifeq ("$(strip $(ARCH))","arm")
|
ifeq ("$(strip $(ARCH))","arm")
|
||||||
toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) arm-softfloat.patch.conditional
|
toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) arm-softfloat.patch.conditional
|
||||||
endif
|
endif
|
||||||
@ -190,7 +190,7 @@ endif
|
|||||||
#
|
#
|
||||||
# Now for the ugly 3.3.x soft float hack...
|
# Now for the ugly 3.3.x soft float hack...
|
||||||
#
|
#
|
||||||
ifeq ($(SOFT_FLOAT),true)
|
ifeq ($(BR2_SOFT_FLOAT),y)
|
||||||
ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.)
|
ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.)
|
||||||
# Make sure we have a soft float specs file for this arch
|
# Make sure we have a soft float specs file for this arch
|
||||||
if [ ! -f toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float ] ; then \
|
if [ ! -f toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float ] ; then \
|
||||||
@ -279,7 +279,7 @@ $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled
|
|||||||
#
|
#
|
||||||
# Now for the ugly 3.3.x soft float hack...
|
# Now for the ugly 3.3.x soft float hack...
|
||||||
#
|
#
|
||||||
ifeq ($(SOFT_FLOAT),true)
|
ifeq ($(BR2_SOFT_FLOAT),y)
|
||||||
ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.)
|
ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.)
|
||||||
# Add a specs file that defaults to soft float mode.
|
# Add a specs file that defaults to soft float mode.
|
||||||
cp toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float $(TARGET_DIR)/usr/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs
|
cp toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float $(TARGET_DIR)/usr/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs
|
||||||
|
Loading…
Reference in New Issue
Block a user