From: "Joseph S. Myers" <joseph@codesourcery.com>
To: libc-ports@sourceware.org
Subject: Support sharing ARM headers for hard and soft float
Date: Wed, 30 May 2012 18:58:00 -0000 [thread overview]
Message-ID: <Pine.LNX.4.64.1205301856110.8161@digraph.polyomino.org.uk> (raw)
Different dynamic linker names for ARM hard and soft float ABIs means
different gnu/lib-names.h contents - but it is desirable for one compiler
to be able to target multilibs with both ABIs using a single set of
headers. I've applied this patch to use the new general biarch/triarch
support for generated headers to build a gnu/lib-names.h supporting both
ABIs. (syscall.h and stubs.h should always get identical contents for
both ABIs, the issue is just for gnu/lib-names.h.)
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 <joseph@codesourcery.com>
+ * 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
--
Joseph S. Myers
joseph@codesourcery.com
next reply other threads:[~2012-05-30 18:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-30 18:58 Joseph S. Myers [this message]
2012-05-30 19:27 ` Roland McGrath
2012-05-30 19:37 ` Joseph S. Myers
2012-05-31 21:58 ` Roland McGrath
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.1205301856110.8161@digraph.polyomino.org.uk \
--to=joseph@codesourcery.com \
--cc=libc-ports@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).