From: Richard Henderson <rth@twiddle.net>
To: libc-ports@sourceware.org
Cc: joseph@codesourcery.com
Subject: [PATCH v2 09/14] arm: Tidy architecture selection
Date: Fri, 01 Mar 2013 17:36:00 -0000 [thread overview]
Message-ID: <1362159320-5934-10-git-send-email-rth@twiddle.net> (raw)
In-Reply-To: <1362159320-5934-1-git-send-email-rth@twiddle.net>
---
* sysdeps/arm/sysdep.h (__ARM_ARCH): New macro.
(ARCH_HAS_BX, ARCH_HAS_BLX, ARCH_HAS_T2): New macros.
(BX): Select on ARCH_HAS_BX instead of __USE_BX__.
(BLX): Select on ARCH_HAS_BLX instead of __ARM_ARCH_4T__.
* ports/sysdeps/arm/dl-machine.h (BX): Select on ARCH_HAS_BX
instead of __USE_BX__.
---
ports/sysdeps/arm/dl-machine.h | 2 +-
ports/sysdeps/arm/sysdep.h | 41 ++++++++++++++++++++++++++++++++++-------
2 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/ports/sysdeps/arm/dl-machine.h b/ports/sysdeps/arm/dl-machine.h
index 30ad46c..5a424f8 100644
--- a/ports/sysdeps/arm/dl-machine.h
+++ b/ports/sysdeps/arm/dl-machine.h
@@ -136,7 +136,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
return lazy;
}
-#if defined(__USE_BX__)
+#if defined(ARCH_HAS_BX)
#define BX(x) "bx\t" #x
#else
#define BX(x) "mov\tpc, " #x
diff --git a/ports/sysdeps/arm/sysdep.h b/ports/sysdeps/arm/sysdep.h
index 84313fe..c09e680 100644
--- a/ports/sysdeps/arm/sysdep.h
+++ b/ports/sysdeps/arm/sysdep.h
@@ -19,9 +19,36 @@
#include <sysdeps/generic/sysdep.h>
#include <features.h>
-#if (!defined (__ARM_ARCH_2__) && !defined (__ARM_ARCH_3__) \
- && !defined (__ARM_ARCH_3M__) && !defined (__ARM_ARCH_4__))
-# define __USE_BX__
+/* The __ARM_ARCH define is provided by gcc 4.8. Construct it otherwise. */
+#ifndef __ARM_ARCH
+# ifdef __ARM_ARCH_2__
+# define __ARM_ARCH 2
+# elif defined(__ARM_ARCH_3__) || defined(__ARM_ARCH_3M__)
+# define __ARM_ARCH 3
+# elif defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)
+# define __ARM_ARCH 4
+# elif defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5TE__) \
+ defined(__ARM_ARCH_5TEJ__)
+# define __ARM_ARCH 5
+# elif defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6ZK__) \
+ defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__)
+# define __ARM_ARCH 6
+# elif defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) \
+ defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__)
+# define __ARM_ARCH 7
+# else
+# error unknown arm architecture
+# endif
+#endif
+
+#if __ARM_ARCH > 4 || defined(__ARM_ARCH_4T__)
+# define ARCH_HAS_BX
+#endif
+#if __ARM_ARCH > 4
+# define ARCH_HAS_BLX
+#endif
+#if __ARM_ARCH > 6 || defined(__ARM_ARCH_6T2__)
+# define ARCH_HAS_T2
#endif
#ifdef __ASSEMBLER__
@@ -33,13 +60,13 @@
#define PLTJMP(_x) _x##(PLT)
-#ifdef __USE_BX__
+#ifdef ARCH_HAS_BX
# define BX(R) bx R
# define BXC(C, R) bx##C R
-# ifdef __ARM_ARCH_4T__
-# define BLX(R) mov lr, pc; bx R
-# else
+# ifdef ARCH_HAS_BLX
# define BLX(R) blx R
+# else
+# define BLX(R) mov lr, pc; bx R
# endif
#else
# define BX(R) mov pc, R
--
1.8.1.2
next prev parent reply other threads:[~2013-03-01 17:36 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-01 17:36 [PATCH v2 00/14] ARM improvements Richard Henderson
2013-03-01 17:36 ` [PATCH v2 07/14] arm: Commonize BX conditionals Richard Henderson
2013-03-01 17:36 ` [PATCH v2 12/14] arm: Add optimized addmul_1 Richard Henderson
2013-03-01 17:58 ` Roland McGrath
2013-03-01 18:00 ` Roland McGrath
2013-03-06 1:18 ` Joseph S. Myers
2013-10-25 22:13 ` Roland McGrath
2013-03-06 1:11 ` Joseph S. Myers
2013-03-01 17:36 ` [PATCH v2 02/14] arm: Introduce and use NEGOFF series of macros Richard Henderson
2013-03-01 17:57 ` Roland McGrath
2013-03-05 1:42 ` Joseph S. Myers
2013-03-01 17:36 ` [PATCH v2 04/14] arm: Enable thumb2 mode in assembly files Richard Henderson
2013-03-01 17:36 ` [PATCH v2 01/14] arm: Introduce and use LDST_PCREL Richard Henderson
2013-03-04 17:47 ` Joseph S. Myers
2013-03-01 17:36 ` [PATCH v2 03/14] arm: Introduce and use GET_TLS Richard Henderson
2013-03-01 17:57 ` Roland McGrath
2013-03-05 1:45 ` Joseph S. Myers
2013-03-01 17:36 ` [PATCH v2 08/14] arm: Unless arm4t, pop return address directly into pc Richard Henderson
2013-03-01 17:36 ` [PATCH v2 10/14] arm: Implement hard-tp for GET_TLS Richard Henderson
2013-03-01 17:55 ` Roland McGrath
2013-03-05 2:01 ` Joseph S. Myers
2013-03-01 17:36 ` [PATCH v2 13/14] arm: Add optimized submul_1 Richard Henderson
2013-03-01 17:58 ` Roland McGrath
2013-03-06 1:14 ` Joseph S. Myers
2013-03-01 17:36 ` [PATCH v2 11/14] arm: Add optimized ffs for armv6t2 Richard Henderson
2013-03-05 2:08 ` Joseph S. Myers
2013-03-06 15:52 ` Richard Henderson
2013-03-01 17:36 ` [PATCH v2 06/14] arm: Delete LOADREGS macro Richard Henderson
2013-03-01 17:36 ` [PATCH v2 14/14] arm: Add optimized add_n and sub_n Richard Henderson
2013-03-01 17:59 ` Roland McGrath
2013-03-06 0:53 ` Joseph S. Myers
2013-03-01 17:36 ` [PATCH v2 05/14] arm: Use push/pop mnemonics Richard Henderson
2013-03-01 17:36 ` Richard Henderson [this message]
2013-03-01 17:55 ` [PATCH v2 09/14] arm: Tidy architecture selection Roland McGrath
2013-03-05 2:01 ` Joseph S. Myers
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=1362159320-5934-10-git-send-email-rth@twiddle.net \
--to=rth@twiddle.net \
--cc=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).