From 66625b24f2f2f1ae451552a289213ec297e8a3c2 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 30 May 2012 18:55:55 +0000 Subject: [PATCH] Support sharing ARM headers for hard and soft float. --- ChangeLog.arm | 12 ++++++++++++ sysdeps/unix/sysv/linux/arm/Makefile | 26 ++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/ChangeLog.arm b/ChangeLog.arm index 9a3962e..f57a2e1 100644 --- a/ChangeLog.arm +++ b/ChangeLog.arm @@ -1,5 +1,17 @@ 2012-05-30 Joseph Myers + * sysdeps/unix/sysv/linux/arm/Makefile (default-abi-prog): New + variable. + (default-abi): Likewise. + (abi-includes): Likewise. + (abi-variants): Likewise. + (abi-soft-options): Likewise. + (abi-soft-condition): Likewise. + (abi-soft-ld-soname): Likewise. + (abi-hard-options): Likewise. + (abi-hard-condition): Likewise. + (abi-hard-ld-soname): Likewise. + * sysdeps/unix/sysv/linux/arm/kernel-features.h (__ASSUME_TRUNCATE64_SYSCALL): Remove. diff --git a/sysdeps/unix/sysv/linux/arm/Makefile b/sysdeps/unix/sysv/linux/arm/Makefile index fb1e3a5..d9eb10c 100644 --- a/sysdeps/unix/sysv/linux/arm/Makefile +++ b/sysdeps/unix/sysv/linux/arm/Makefile @@ -65,3 +65,29 @@ LDFLAGS-tst-rfc3484 += $(common-objpfx)csu/libc-do-syscall.o LDFLAGS-tst-rfc3484-2 += $(common-objpfx)csu/libc-do-syscall.o LDFLAGS-tst-rfc3484-3 += $(common-objpfx)csu/libc-do-syscall.o endif + +define default-abi-prog +echo '#ifdef __ARM_PCS_VFP'; +echo 'hard'; +echo '#else'; +echo 'soft'; +echo '#endif' +endef +default-abi := $(strip $(shell \ + ($(default-abi-prog)) | $(CC) $(CFLAGS) $(CPPFLAGS) -E -P -)) +ifeq ($(default-abi),hard) +# OK. +else +ifneq ($(default-abi),soft) +Unknown ABI, must be "hard" or "soft". +endif +endif + +abi-includes := +abi-variants := soft hard +abi-soft-options := -U__ARM_PCS_VFP +abi-soft-condition := !defined __ARM_PCS_VFP +abi-soft-ld-soname := ld-linux.so.3 +abi-hard-options := -D__ARM_PCS_VFP +abi-hard-condition := defined __ARM_PCS_VFP +abi-hard-ld-soname := ld-linux-armhf.so.3 -- 2.7.4