From: Indu Bhagat <indu.bhagat@oracle.com>
To: binutils@sourceware.org
Cc: zac.walker@linaro.org, Indu Bhagat <indu.bhagat@oracle.com>
Subject: [PATCH] [gas, aarch64]: fix build breakage for aarch64-pe
Date: Wed, 16 Nov 2022 15:21:32 -0800 [thread overview]
Message-ID: <20221116232132.1009459-1-indu.bhagat@oracle.com> (raw)
Hi,
This patch should fix the build breakage on aarch64-pe caused by the SFrame
patch series.
The issue was that the definitions related to SFrame APIs were not guarded by
OBJ_ELF, they were errneously guarded by a more relaxed condition of OBJ_ELF
|| OBJ_COFF, hence causing build failures.
Testing notes:
- Tested build and make -k check for selected folders for --target=aarch64-pe.
Thanks
Indu
---------------------
SFrame is supported for ELF only. Keep the definitions and declarations
guarded with OBJ_ELF consistently.
ChangeLog:
* gas/config/tc-aarch64.h: Guard SFrame related definitions
with OBJ_ELF.
---
gas/config/tc-aarch64.h | 42 ++++++++++++++++++++++-------------------
1 file changed, 23 insertions(+), 19 deletions(-)
diff --git a/gas/config/tc-aarch64.h b/gas/config/tc-aarch64.h
index 91412ce8292..00efc26263c 100644
--- a/gas/config/tc-aarch64.h
+++ b/gas/config/tc-aarch64.h
@@ -239,6 +239,28 @@ struct aarch64_segment_info_type
/* We want .cfi_* pseudo-ops for generating unwind info. */
#define TARGET_USE_CFIPOP 1
+/* CFI hooks. */
+#define tc_regname_to_dw2regnum tc_aarch64_regname_to_dw2regnum
+#define tc_cfi_frame_initial_instructions tc_aarch64_frame_initial_instructions
+
+extern void aarch64_after_parse_args (void);
+#define md_after_parse_args() aarch64_after_parse_args ()
+
+#else /* Neither OBJ_ELF nor OBJ_COFF. */
+#define GLOBAL_OFFSET_TABLE_NAME "__GLOBAL_OFFSET_TABLE_"
+#endif
+
+#if defined OBJ_ELF || defined OBJ_COFF
+
+# define EXTERN_FORCE_RELOC 1
+# define tc_fix_adjustable(FIX) 1
+/* Values passed to md_apply_fix don't include the symbol value. */
+# define MD_APPLY_SYM_VALUE(FIX) 0
+
+#endif
+
+#ifdef OBJ_ELF
+
/* Whether SFrame unwind info is supported. */
extern bool aarch64_support_sframe_p (void);
#define support_sframe_p aarch64_support_sframe_p
@@ -268,25 +290,7 @@ extern offsetT aarch64_sframe_cfa_ra_offset (void);
unsigned char aarch64_sframe_get_abi_arch (void);
#define sframe_get_abi_arch aarch64_sframe_get_abi_arch
-/* CFI hooks. */
-#define tc_regname_to_dw2regnum tc_aarch64_regname_to_dw2regnum
-#define tc_cfi_frame_initial_instructions tc_aarch64_frame_initial_instructions
-
-extern void aarch64_after_parse_args (void);
-#define md_after_parse_args() aarch64_after_parse_args ()
-
-#else /* Not OBJ_ELF. */
-#define GLOBAL_OFFSET_TABLE_NAME "__GLOBAL_OFFSET_TABLE_"
-#endif
-
-#if defined OBJ_ELF || defined OBJ_COFF
-
-# define EXTERN_FORCE_RELOC 1
-# define tc_fix_adjustable(FIX) 1
-/* Values passed to md_apply_fix don't include the symbol value. */
-# define MD_APPLY_SYM_VALUE(FIX) 0
-
-#endif
+#endif /* OBJ_ELF */
#define MD_PCREL_FROM_SECTION(F,S) md_pcrel_from_section(F,S)
--
2.37.2
next reply other threads:[~2022-11-16 23:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-16 23:21 Indu Bhagat [this message]
2022-11-17 3:29 ` Alan Modra
2022-11-17 6:02 ` [PATCH,V2] " Indu Bhagat
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=20221116232132.1009459-1-indu.bhagat@oracle.com \
--to=indu.bhagat@oracle.com \
--cc=binutils@sourceware.org \
--cc=zac.walker@linaro.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).