Delivered-To: raj.khem@gmail.com Received: by 10.90.86.4 with SMTP id j4cs313309agb; Sat, 8 Jan 2011 16:45:20 -0800 (PST) Received: by 10.216.173.7 with SMTP id u7mr612034wel.50.1294533919433; Sat, 08 Jan 2011 16:45:19 -0800 (PST) Return-Path: Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123]) by mx.google.com with ESMTP id e10si33752027wer.68.2011.01.08.16.45.19; Sat, 08 Jan 2011 16:45:19 -0800 (PST) Received-SPF: neutral (google.com: 80.12.242.123 is neither permitted nor denied by best guess record for domain of yann.morin.1998@anciens.enib.fr) client-ip=80.12.242.123; Authentication-Results: mx.google.com; spf=neutral (google.com: 80.12.242.123 is neither permitted nor denied by best guess record for domain of yann.morin.1998@anciens.enib.fr) smtp.mail=yann.morin.1998@anciens.enib.fr Received: from roazhon.bzh.lan ([90.32.245.227]) by mwinf5d24 with ME id tClC1f0024v5z3u03ClJDu; Sun, 09 Jan 2011 01:45:18 +0100 From: "Yann E. MORIN" To: uclibc@uclibc.org Cc: Khem Raj , Bernhard Reutner-Fischer , Carmelo AMOROSO Subject: [PATCH 7/7] ARM: remove EABI/OABI selection Date: Sun, 9 Jan 2011 01:45:10 +0100 Message-Id: <1294533910-19305-8-git-send-email-yann.morin.1998@anciens.enib.fr> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr> References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr> Rely on the compiler to be properly setup for the default ABI. When installing-headers, there are two cases: - NPTL: no issue, a cross-compiler is already expected - LinuxThreads: no issue, EABI/OABI has no impact on installed headers. Signed-off-by: "Yann E. MORIN" Cc: Khem Raj Cc: Bernhard Reutner-Fischer Cc: Carmelo AMOROSO --- extra/Configs/Config.arm | 11 ----------- libc/sysdeps/linux/arm/Makefile.arch | 9 +++++++-- libc/sysdeps/linux/arm/bits/huge_val.h | 4 ++-- 3 files changed, 9 insertions(+), 15 deletions(-) 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 \ + |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