| Message ID | 20170628151713.10746-1-Vincent.Riera@imgtec.com |
|---|---|
| State | Accepted |
| Headers | show |
Hello, On Wed, 28 Jun 2017 16:17:10 +0100, Vicente Olivert Riera wrote: > MIPS supports two different NaN encodings, legacy and 2008. Information > about MIPS NaN encodings can be found here: > > https://sourceware.org/binutils/docs/as/MIPS-NaN-Encodings.html > > NaN legacy is the only option available for R2 cores and older. > NaN 2008 is the only option available for R6 cores. > R5 cores can have either NaN legacy or NaN 2008, depending on the > implementation. So, if the user selects a generic R5 target architecture > variant, we show a choice menu with both options available. For well > known R5 cores we directly select the NaN enconding they use. > > Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> > --- > Changes v4 -> v6: > - Nothing > Changes v3 -> v4: > - Do not have a default list for NAN options. Instead, select them from > the BR2_MIPS_CPU_* options. (Arnout) > - uclibc/Config.in: use the new NAN options from arch/Config.in.mips > Changes v2 -> v3: > - Nothing > Changes v1 -> v2: > - Define config symbol in arch/Config.in > - Change string "NAN" to "NaN" > --- > arch/Config.in | 3 ++ > arch/Config.in.mips | 36 ++++++++++++++++++++++ > package/gcc/gcc.mk | 7 +++++ > package/uclibc/Config.in | 4 +-- > .../toolchain-external/pkg-toolchain-external.mk | 5 +++ > toolchain/toolchain-wrapper.c | 3 ++ > 6 files changed, 56 insertions(+), 2 deletions(-) Applied to master, thanks! Thomas
Hello, On Wed, 28 Jun 2017 16:17:10 +0100, Vicente Olivert Riera wrote: > +choice > + prompt "Target NaN" > + depends on BR2_mips_32r5 || BR2_mips_64r5 > + default BR2_MIPS_ENABLE_NAN_2008 > + > + help > + NaN encoding to be used In fact, it would be good here to have a much more detailed help text, perhaps by re-using bits of your commit log. Same for the FP32 patch. Could you send follow-up patches improving those help texts? Thanks, Thomas
Hello,
On Sun, 16 Jul 2017 16:40:00 +0200, Thomas Petazzoni wrote:
> Applied to master, thanks!
This patch is causing some build failures with external toolchains:
http://autobuild.buildroot.net/results/ca1/ca1b769709f2566789e0030221c6837af95459f3/build-end.log
http://autobuild.buildroot.net/results/970/9700c17425c9a10e4f0b72a0932268274068e64a/build-end.log
Is it because the gcc of this external toolchain is too old ? What can
we do about this ?
Best regards,
Thomas
Hello Thomas, On 17/07/17 10:34, Thomas Petazzoni wrote: > Hello, > > On Sun, 16 Jul 2017 16:40:00 +0200, Thomas Petazzoni wrote: > >> Applied to master, thanks! > > This patch is causing some build failures with external toolchains: > > http://autobuild.buildroot.net/results/ca1/ca1b769709f2566789e0030221c6837af95459f3/build-end.log > > http://autobuild.buildroot.net/results/970/9700c17425c9a10e4f0b72a0932268274068e64a/build-end.log > > Is it because the gcc of this external toolchain is too old ? Yes, the -mnan= option was introduced in gcc 4.9.0 by this commit: 0bd32132d471995f3e333138363d1d928a9dde60 The gcc of that external toolchain is 4.8.2. > What can we do about this ? I guess we could use an option called BR2_GCC_SUPPORTS_MNAN in order to avoid adding the -mnan option to the CFLAGS and to the tc-wrapper if the external toolchain hasn't selected that option. For internal toolchain, since the oldest gcc version we support is 4.9.4, then it should be always selected. Vincent > > Best regards, > > Thomas >
Hello, On Mon, 17 Jul 2017 13:03:05 +0100, Vicente Olivert Riera wrote: > > Is it because the gcc of this external toolchain is too old ? > > Yes, the -mnan= option was introduced in gcc 4.9.0 by this commit: > > 0bd32132d471995f3e333138363d1d928a9dde60 > > The gcc of that external toolchain is 4.8.2. OK, that explains it. > > What can we do about this ? > > I guess we could use an option called BR2_GCC_SUPPORTS_MNAN in order to > avoid adding the -mnan option to the CFLAGS and to the tc-wrapper if the > external toolchain hasn't selected that option. For internal toolchain, > since the oldest gcc version we support is 4.9.4, then it should be > always selected. Sounds good to me. I guess those older gcc versions (4.8 and before) anyway only supported the legacy NaN encoding, and therefore behave as if -mnan=legacy is passed, correct? You might also want to check if the same problem will happen (or not) for the FP32 mode, and the DSP/MSA options :) Thanks! Thomas
Hi Thomas, On 17/07/17 13:11, Thomas Petazzoni wrote: > Hello, > > On Mon, 17 Jul 2017 13:03:05 +0100, Vicente Olivert Riera wrote: > >>> Is it because the gcc of this external toolchain is too old ? >> >> Yes, the -mnan= option was introduced in gcc 4.9.0 by this commit: >> >> 0bd32132d471995f3e333138363d1d928a9dde60 >> >> The gcc of that external toolchain is 4.8.2. > > OK, that explains it. > >>> What can we do about this ? >> >> I guess we could use an option called BR2_GCC_SUPPORTS_MNAN in order to >> avoid adding the -mnan option to the CFLAGS and to the tc-wrapper if the >> external toolchain hasn't selected that option. For internal toolchain, >> since the oldest gcc version we support is 4.9.4, then it should be >> always selected. > > Sounds good to me. I guess those older gcc versions (4.8 and before) > anyway only supported the legacy NaN encoding, and therefore behave as > if -mnan=legacy is passed, correct? Correct. > You might also want to check if the same problem will happen (or not) > for the FP32 mode, and the DSP/MSA options :) I'll check it out, yes. Thanks, Vincent > Thanks! > > Thomas >
diff --git a/arch/Config.in b/arch/Config.in index 50377a9af..e921879d0 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -264,6 +264,9 @@ config BR2_GCC_TARGET_ARCH config BR2_GCC_TARGET_ABI string +config BR2_GCC_TARGET_NAN + string + config BR2_GCC_TARGET_CPU string diff --git a/arch/Config.in.mips b/arch/Config.in.mips index 4e9ad12ad..76ae44714 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -1,20 +1,26 @@ # mips default CPU ISAs config BR2_MIPS_CPU_MIPS32 bool + select BR2_MIPS_NAN_LEGACY config BR2_MIPS_CPU_MIPS32R2 bool + select BR2_MIPS_NAN_LEGACY config BR2_MIPS_CPU_MIPS32R5 bool config BR2_MIPS_CPU_MIPS32R6 bool + select BR2_MIPS_NAN_2008 config BR2_MIPS_CPU_MIPS64 bool + select BR2_MIPS_NAN_LEGACY config BR2_MIPS_CPU_MIPS64R2 bool + select BR2_MIPS_NAN_LEGACY config BR2_MIPS_CPU_MIPS64R5 bool config BR2_MIPS_CPU_MIPS64R6 bool + select BR2_MIPS_NAN_2008 choice prompt "Target Architecture Variant" @@ -51,6 +57,7 @@ config BR2_mips_m5150 bool "M5150" depends on !BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS32R5 + select BR2_MIPS_NAN_2008 config BR2_mips_m6250 bool "M6250" depends on !BR2_ARCH_IS_64 @@ -59,6 +66,7 @@ config BR2_mips_p5600 bool "P5600" depends on !BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS32R5 + select BR2_MIPS_NAN_2008 config BR2_mips_xburst bool "XBurst" depends on !BR2_ARCH_IS_64 @@ -126,6 +134,34 @@ config BR2_MIPS_SOFT_FLOAT floating point functions, then everything will need to be compiled with soft floating point support (-msoft-float). +config BR2_MIPS_NAN_LEGACY + bool + +config BR2_MIPS_NAN_2008 + bool + +choice + prompt "Target NaN" + depends on BR2_mips_32r5 || BR2_mips_64r5 + default BR2_MIPS_ENABLE_NAN_2008 + + help + NaN encoding to be used + +config BR2_MIPS_ENABLE_NAN_LEGACY + bool "legacy" + select BR2_MIPS_NAN_LEGACY + +config BR2_MIPS_ENABLE_NAN_2008 + bool "2008" + depends on !BR2_MIPS_SOFT_FLOAT + select BR2_MIPS_NAN_2008 +endchoice + +config BR2_GCC_TARGET_NAN + default "legacy" if BR2_MIPS_NAN_LEGACY + default "2008" if BR2_MIPS_NAN_2008 + config BR2_ARCH default "mips" if BR2_mips default "mipsel" if BR2_mipsel diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index b52f9456b..c0249cd50 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -204,6 +204,9 @@ endif ifneq ($(call qstrip,$(BR2_GCC_TARGET_ABI)),) HOST_GCC_COMMON_CONF_OPTS += --with-abi=$(BR2_GCC_TARGET_ABI) endif +ifneq ($(call qstrip,$(BR2_GCC_TARGET_NAN)),) +HOST_GCC_COMMON_CONF_OPTS += --with-nan=$(BR2_GCC_TARGET_NAN) +endif ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),) ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),) HOST_GCC_COMMON_CONF_OPTS += --with-cpu=$(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVISION)) @@ -254,6 +257,7 @@ HOST_GCC_COMMON_WRAPPER_TARGET_CPU := $(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_ endif HOST_GCC_COMMON_WRAPPER_TARGET_ARCH := $(call qstrip,$(BR2_GCC_TARGET_ARCH)) HOST_GCC_COMMON_WRAPPER_TARGET_ABI := $(call qstrip,$(BR2_GCC_TARGET_ABI)) +HOST_GCC_COMMON_WRAPPER_TARGET_NAN := $(call qstrip,$(BR2_GCC_TARGET_NAN)) HOST_GCC_COMMON_WRAPPER_TARGET_FPU := $(call qstrip,$(BR2_GCC_TARGET_FPU)) HOST_GCC_COMMON_WRAPPER_TARGET_FLOAT_ABI := $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI)) HOST_GCC_COMMON_WRAPPER_TARGET_MODE := $(call qstrip,$(BR2_GCC_TARGET_MODE)) @@ -267,6 +271,9 @@ endif ifneq ($(HOST_GCC_COMMON_WRAPPER_TARGET_ABI),) HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_ABI='"$(HOST_GCC_COMMON_WRAPPER_TARGET_ABI)"' endif +ifneq ($(HOST_GCC_COMMON_WRAPPER_TARGET_NAN),) +HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_NAN='"$(HOST_GCC_COMMON_WRAPPER_TARGET_NAN)"' +endif ifneq ($(HOST_GCC_COMMON_WRAPPER_TARGET_FPU),) HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_FPU='"$(HOST_GCC_COMMON_WRAPPER_TARGET_FPU)"' endif diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index b0b0b010f..3b4f91da9 100644 --- a/package/uclibc/Config.in +++ b/package/uclibc/Config.in @@ -123,8 +123,8 @@ config BR2_UCLIBC_MIPS_ABI config BR2_UCLIBC_MIPS_NAN string - default "LEGACY" if BR2_MIPS_CPU_MIPS32 || BR2_MIPS_CPU_MIPS64 - default "2008" if BR2_MIPS_CPU_MIPS32R6 || BR2_MIPS_CPU_MIPS64R6 + default "LEGACY" if BR2_MIPS_NAN_LEGACY + default "2008" if BR2_MIPS_NAN_2008 depends on BR2_UCLIBC_TARGET_ARCH = "mips" config BR2_UCLIBC_SH_TYPE diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index 826934505..29c0aade1 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -156,6 +156,7 @@ CC_TARGET_CPU_ := $(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVIS endif CC_TARGET_ARCH_ := $(call qstrip,$(BR2_GCC_TARGET_ARCH)) CC_TARGET_ABI_ := $(call qstrip,$(BR2_GCC_TARGET_ABI)) +CC_TARGET_NAN_ := $(call qstrip,$(BR2_GCC_TARGET_NAN)) CC_TARGET_FPU_ := $(call qstrip,$(BR2_GCC_TARGET_FPU)) CC_TARGET_FLOAT_ABI_ := $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI)) CC_TARGET_MODE_ := $(call qstrip,$(BR2_GCC_TARGET_MODE)) @@ -178,6 +179,10 @@ ifneq ($(CC_TARGET_ABI_),) TOOLCHAIN_EXTERNAL_CFLAGS += -mabi=$(CC_TARGET_ABI_) TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_ABI='"$(CC_TARGET_ABI_)"' endif +ifneq ($(CC_TARGET_NAN_),) +TOOLCHAIN_EXTERNAL_CFLAGS += -mnan=$(CC_TARGET_NAN_) +TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_NAN='"$(CC_TARGET_NAN_)"' +endif ifneq ($(CC_TARGET_FPU_),) TOOLCHAIN_EXTERNAL_CFLAGS += -mfpu=$(CC_TARGET_FPU_) TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_FPU='"$(CC_TARGET_FPU_)"' diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index 100aa181c..28066e425 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -51,6 +51,9 @@ static char *predef_args[] = { #ifdef BR_ABI "-mabi=" BR_ABI, #endif +#ifdef BR_NAN + "-mnan=" BR_NAN, +#endif #ifdef BR_FPU "-mfpu=" BR_FPU, #endif
MIPS supports two different NaN encodings, legacy and 2008. Information about MIPS NaN encodings can be found here: https://sourceware.org/binutils/docs/as/MIPS-NaN-Encodings.html NaN legacy is the only option available for R2 cores and older. NaN 2008 is the only option available for R6 cores. R5 cores can have either NaN legacy or NaN 2008, depending on the implementation. So, if the user selects a generic R5 target architecture variant, we show a choice menu with both options available. For well known R5 cores we directly select the NaN enconding they use. Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> --- Changes v4 -> v6: - Nothing Changes v3 -> v4: - Do not have a default list for NAN options. Instead, select them from the BR2_MIPS_CPU_* options. (Arnout) - uclibc/Config.in: use the new NAN options from arch/Config.in.mips Changes v2 -> v3: - Nothing Changes v1 -> v2: - Define config symbol in arch/Config.in - Change string "NAN" to "NaN" --- arch/Config.in | 3 ++ arch/Config.in.mips | 36 ++++++++++++++++++++++ package/gcc/gcc.mk | 7 +++++ package/uclibc/Config.in | 4 +-- .../toolchain-external/pkg-toolchain-external.mk | 5 +++ toolchain/toolchain-wrapper.c | 3 ++ 6 files changed, 56 insertions(+), 2 deletions(-)