libc/sysdeps/linux/arm/bits/huge_val.h | 4 ++--\r
3 files changed, 9 insertions(+), 15 deletions(-)\r
\r
-diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm\r
-index 9aa9e56..85f2515 100644\r
---- a/extra/Configs/Config.arm\r
-+++ b/extra/Configs/Config.arm\r
-@@ -12,17 +12,6 @@ config FORCE_OPTIONS_FOR_ARCH\r
- default y\r
- select ARCH_ANY_ENDIAN\r
- \r
--config CONFIG_ARM_EABI\r
-- bool "Build for EABI"\r
-- help\r
-- If you say 'y' here, functions and constants required by the\r
-- ARM EABI will be built into the library. You should say 'y'\r
-- if your compiler uses the ARM EABI, in which case you will also\r
-- need a kernel supporting the EABI system call interface.\r
-- \r
-- If you say 'n' here, then the library will be built for the\r
-- old Linux ABI.\r
--\r
- config COMPILE_IN_THUMB_MODE\r
- bool "Build using Thumb mode"\r
- select USE_BX\r
-diff --git a/libc/sysdeps/linux/arm/Makefile.arch b/libc/sysdeps/linux/arm/Makefile.arch\r
-index b53c539..14279e0 100644\r
---- a/libc/sysdeps/linux/arm/Makefile.arch\r
-+++ b/libc/sysdeps/linux/arm/Makefile.arch\r
-@@ -24,7 +24,12 @@ ifeq ($(UCLIBC_HAS_ADVANCED_REALTIME),y)\r
- CSRC += posix_fadvise.c posix_fadvise64.c\r
- endif\r
- \r
--ifeq ($(CONFIG_ARM_EABI),y)\r
-+# Is our compiler set up for EABI ?\r
-+IS_EABI:=$(shell $(CC) $(CFLAGS) -x c - -E -dM </dev/null 2>/dev/null \\r
-+ |sed -r -e '/^\#[[:space:]]*define[[:space:]]+__ARM_EABI__([[:space:]]+1)?$$/!d; s/.+/y/;' \\r
-+ )\r
-+\r
-+ifeq ($(IS_EABI),y)\r
- CSRC += aeabi_assert.c aeabi_atexit.c aeabi_errno_addr.c \\r
- aeabi_localeconv.c aeabi_memclr.c aeabi_memcpy.c \\r
- aeabi_memmove.c aeabi_memset.c find_exidx.c\r
-@@ -37,7 +42,7 @@ else\r
- CSRC += syscall.c\r
- endif\r
- \r
--ifeq ($(CONFIG_ARM_EABI),y)\r
-+ifeq ($(IS_EABI),y)\r
- libc-static-y += $(ARCH_OUT)/aeabi_lcsts.o $(ARCH_OUT)/aeabi_math.o \\r
- $(ARCH_OUT)/aeabi_sighandlers.o\r
- libc-nonshared-y += $(ARCH_OUT)/aeabi_lcsts.os $(ARCH_OUT)/aeabi_math.os \\r
-diff --git a/libc/sysdeps/linux/arm/bits/huge_val.h b/libc/sysdeps/linux/arm/bits/huge_val.h\r
-index a215f3c..745e0bb 100644\r
---- a/libc/sysdeps/linux/arm/bits/huge_val.h\r
-+++ b/libc/sysdeps/linux/arm/bits/huge_val.h\r
-@@ -32,7 +32,7 @@\r
- # define HUGE_VAL (__extension__ 0x1.0p2047)\r
- #elif defined __GNUC__\r
- \r
--#ifndef __CONFIG_ARM_EABI__\r
-+#ifndef __ARM_EABI__\r
- # define HUGE_VAL \\r
- (__extension__ \\r
- ((union { unsigned __l __attribute__((__mode__(__DI__))); double __d; }) \\r
-@@ -50,7 +50,7 @@\r
- \r
- typedef union { unsigned char __c[8]; double __d; } __huge_val_t;\r
- \r
--#ifndef __CONFIG_ARM_EABI__\r
-+#ifndef __ARM_EABI__\r
- # if __BYTE_ORDER == __BIG_ENDIAN\r
- # define __HUGE_VAL_bytes { 0, 0, 0, 0, 0x7f, 0xf0, 0, 0 }\r
- # endif\r
--- \r
-1.7.1\r
-\r
+Index: git/libc/sysdeps/linux/arm/Makefile.arch
+===================================================================
+--- git.orig/libc/sysdeps/linux/arm/Makefile.arch
++++ git/libc/sysdeps/linux/arm/Makefile.arch
+@@ -24,7 +24,12 @@ ifeq ($(UCLIBC_HAS_ADVANCED_REALTIME),y)
+ CSRC += posix_fadvise.c posix_fadvise64.c
+ endif
+
+-ifeq ($(CONFIG_ARM_EABI),y)
++# Is our compiler set up for EABI ?
++IS_EABI:=$(shell $(CC) $(CFLAGS) -x c - -E -dM </dev/null 2>/dev/null \
++ |sed -r -e '/^\#[[:space:]]*define[[:space:]]+__ARM_EABI__([[:space:]]+1)?$$/!d; s/.+/y/;' \
++ )
++
++ifeq ($(IS_EABI),y)
+ CSRC += aeabi_assert.c aeabi_atexit.c aeabi_errno_addr.c \
+ aeabi_localeconv.c aeabi_memclr.c aeabi_memcpy.c \
+ aeabi_memmove.c aeabi_memset.c find_exidx.c
+@@ -37,7 +42,7 @@ else
+ CSRC += syscall.c
+ endif
+
+-ifeq ($(CONFIG_ARM_EABI),y)
++ifeq ($(IS_EABI),y)
+ libc-static-y += $(ARCH_OUT)/aeabi_lcsts.o $(ARCH_OUT)/aeabi_math.o \
+ $(ARCH_OUT)/aeabi_sighandlers.o
+ libc-nonshared-y += $(ARCH_OUT)/aeabi_lcsts.os $(ARCH_OUT)/aeabi_math.os \
+Index: git/libc/sysdeps/linux/arm/bits/huge_val.h
+===================================================================
+--- git.orig/libc/sysdeps/linux/arm/bits/huge_val.h
++++ git/libc/sysdeps/linux/arm/bits/huge_val.h
+@@ -32,7 +32,7 @@
+ # define HUGE_VAL (__extension__ 0x1.0p2047)
+ #elif defined __GNUC__
+
+-#ifndef __CONFIG_ARM_EABI__
++#ifndef __ARM_EABI__
+ # define HUGE_VAL \
+ (__extension__ \
+ ((union { unsigned __l __attribute__((__mode__(__DI__))); double __d; }) \
+@@ -50,7 +50,7 @@
+
+ typedef union { unsigned char __c[8]; double __d; } __huge_val_t;
+
+-#ifndef __CONFIG_ARM_EABI__
++#ifndef __ARM_EABI__
+ # if __BYTE_ORDER == __BIG_ENDIAN
+ # define __HUGE_VAL_bytes { 0, 0, 0, 0, 0x7f, 0xf0, 0, 0 }
+ # endif
extra/Configs/Config.arm | 23 ++++++++---------------\r
1 files changed, 8 insertions(+), 15 deletions(-)\r
\r
-diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm\r
-index 6c75a00..227b90c 100644\r
---- a/extra/Configs/Config.arm\r
-+++ b/extra/Configs/Config.arm\r
-@@ -12,23 +12,16 @@ config FORCE_OPTIONS_FOR_ARCH\r
- default y\r
- select ARCH_ANY_ENDIAN\r
- \r
--choice\r
-- prompt "Target ABI"\r
-- default CONFIG_ARM_OABI\r
-+config CONFIG_ARM_EABI\r
-+ bool "Build for EABI"\r
- help\r
-- If you choose "EABI" here, functions and constants required by the\r
-- ARM EABI will be built into the library. You should choose "EABI"\r
-+ If you say 'y' here, functions and constants required by the\r
-+ ARM EABI will be built into the library. You should say 'y'\r
- if your compiler uses the ARM EABI, in which case you will also\r
-- need a kernel supporting the EABI system call interface, or "OABI"\r
-- for a compiler using the old Linux ABI.\r
--\r
--config CONFIG_ARM_OABI\r
-- bool "OABI"\r
--\r
--config CONFIG_ARM_EABI\r
-- bool "EABI"\r
--\r
--endchoice\r
-+ need a kernel supporting the EABI system call interface.\r
-+ \r
-+ If you say 'n' here, then the library will be built for the\r
-+ old Linux ABI.\r
- \r
- config COMPILE_IN_THUMB_MODE\r
- bool "Build using Thumb mode"\r
--- \r
-1.7.1\r
-\r
+Index: git/extra/Configs/Config.arm
+===================================================================
+--- git.orig/extra/Configs/Config.arm
++++ git/extra/Configs/Config.arm
+@@ -12,23 +12,16 @@ config FORCE_OPTIONS_FOR_ARCH
+ default y
+ select ARCH_ANY_ENDIAN
+
+-choice
+- prompt "Target ABI"
+- default CONFIG_ARM_EABI
++config CONFIG_ARM_EABI
++ bool "Build for EABI"
+ help
+- If you choose "EABI" here, functions and constants required by the
+- ARM EABI will be built into the library. You should choose "EABI"
++ If you say 'y' here, functions and constants required by the
++ ARM EABI will be built into the library. You should say 'y'
+ if your compiler uses the ARM EABI, in which case you will also
+- need a kernel supporting the EABI system call interface, or "OABI"
+- for a compiler using the old Linux ABI.
+-
+-config CONFIG_ARM_OABI
+- bool "OABI"
+-
+-config CONFIG_ARM_EABI
+- bool "EABI"
++ need a kernel supporting the EABI system call interface.
+
+-endchoice
++ If you say 'n' here, then the library will be built for the
++ old Linux ABI.
+
+ config COMPILE_IN_THUMB_MODE
+ bool "Build using Thumb mode"