diff options
| -rw-r--r-- | mk/vars.mk | 4 | ||||
| -rw-r--r-- | target/config/Config.in.cpu | 1 | ||||
| -rw-r--r-- | target/config/Config.in.float | 1 | ||||
| -rw-r--r-- | target/or1k/uclibc-ng.config | 3 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 2 |
5 files changed, 10 insertions, 1 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index 1a35f6251..91dfc700e 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -168,6 +168,10 @@ ifeq ($(ADK_TARGET_ARCH_MIPS),y) TARGET_CFLAGS+= -m$(ADK_TARGET_FLOAT)-float TARGET_CXXFLAGS+= -m$(ADK_TARGET_FLOAT)-float endif +ifeq ($(ADK_TARGET_ARCH_OR1K),y) +TARGET_CFLAGS+= -m$(ADK_TARGET_FLOAT)-float +TARGET_CXXFLAGS+= -m$(ADK_TARGET_FLOAT)-float +endif endif ifeq ($(ADK_TARGET_BINFMT_FLAT),y) diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 4124d9ebe..6b1370b66 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -1059,6 +1059,7 @@ config ADK_TARGET_CPU_OR1K select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU + select ADK_TARGET_CPU_WITH_FPU depends on ADK_TARGET_ARCH_OR1K # ppc32 diff --git a/target/config/Config.in.float b/target/config/Config.in.float index 3fd79d2b9..a01f1da65 100644 --- a/target/config/Config.in.float +++ b/target/config/Config.in.float @@ -8,6 +8,7 @@ depends on ADK_TARGET_ARCH_ARM || \ ADK_TARGET_ARCH_M68K || \ ADK_TARGET_ARCH_MIPS || \ ADK_TARGET_ARCH_NIOS2 || \ + ADK_TARGET_ARCH_OR1K || \ ADK_TARGET_ARCH_PPC config ADK_TARGET_HARD_FLOAT diff --git a/target/or1k/uclibc-ng.config b/target/or1k/uclibc-ng.config index 881c73107..7f680d4e4 100644 --- a/target/or1k/uclibc-ng.config +++ b/target/or1k/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.45 C Library Configuration +# uClibc-ng 1.0.52 C Library Configuration # # TARGET_aarch64 is not set # TARGET_alpha is not set @@ -58,6 +58,7 @@ UCLIBC_HAS_FLOATS=y UCLIBC_HAS_FPU=y DO_C99_MATH=y DO_XSI_MATH=y +UCLIBC_HAS_FENV=y UCLIBC_HAS_LONG_DOUBLE_MATH=y KERNEL_HEADERS="" HAVE_DOT_CONFIG=y diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index af036de1a..51fc1fe8b 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -132,8 +132,10 @@ GCC_CONFOPTS+= --with-arch=$(ADK_TARGET_GCC_ARCH) endif ifneq ($(ADK_TARGET_FLOAT),) +ifneq ($(ADK_TARGET_ARCH_OR1K),y) GCC_CONFOPTS+= --with-float=$(ADK_TARGET_FLOAT) endif +endif ifneq ($(ADK_TARGET_FPU),) GCC_CONFOPTS+= --with-fpu=$(ADK_TARGET_FPU) |