Add "do/while(0);" to COPY_INPUT_RELOC_P/VERIFY_COPY_RELOC
Add "do/while(0);" to COPY_INPUT_RELOC_P/VERIFY_COPY_RELOC to avoid potential dangling else problems. * elfxx-x86.h (COPY_INPUT_RELOC_P): Add "do/while(0);". (VERIFY_COPY_RELOC): Likewise.
This commit is contained in:
parent
a1b85d282f
commit
e0d8f43169
|
@ -1,3 +1,8 @@
|
|||
2017-10-06 H.J. Lu <hongjiu.lu@intel.com>
|
||||
|
||||
* elfxx-x86.h (COPY_INPUT_RELOC_P): Add "do/while(0);".
|
||||
(VERIFY_COPY_RELOC): Likewise.
|
||||
|
||||
2017-10-06 H.J. Lu <hongjiu.lu@intel.com>
|
||||
|
||||
* elfxx-x86.h (VERIFY_COPY_RELOC): New.
|
||||
|
|
|
@ -198,24 +198,32 @@
|
|||
|
||||
/* Verify that the symbol has an entry in the procedure linkage table. */
|
||||
#define VERIFY_PLT_ENTRY(INFO, H, PLT, GOTPLT, RELPLT, LOCAL_UNDEFWEAK) \
|
||||
if (((H)->dynindx == -1 \
|
||||
&& !LOCAL_UNDEFWEAK \
|
||||
&& !(((H)->forced_local || bfd_link_executable (INFO)) \
|
||||
&& (H)->def_regular \
|
||||
&& (H)->type == STT_GNU_IFUNC)) \
|
||||
|| (PLT) == NULL \
|
||||
|| (GOTPLT) == NULL \
|
||||
|| (RELPLT) == NULL) \
|
||||
abort ();
|
||||
do \
|
||||
{ \
|
||||
if (((H)->dynindx == -1 \
|
||||
&& !LOCAL_UNDEFWEAK \
|
||||
&& !(((H)->forced_local || bfd_link_executable (INFO)) \
|
||||
&& (H)->def_regular \
|
||||
&& (H)->type == STT_GNU_IFUNC)) \
|
||||
|| (PLT) == NULL \
|
||||
|| (GOTPLT) == NULL \
|
||||
|| (RELPLT) == NULL) \
|
||||
abort (); \
|
||||
} \
|
||||
while (0);
|
||||
|
||||
/* Verify that the symbol supports copy relocation. */
|
||||
#define VERIFY_COPY_RELOC(H, HTAB) \
|
||||
if ((H)->dynindx == -1 \
|
||||
|| ((H)->root.type != bfd_link_hash_defined \
|
||||
&& (H)->root.type != bfd_link_hash_defweak) \
|
||||
|| (HTAB)->elf.srelbss == NULL \
|
||||
|| (HTAB)->elf.sreldynrelro == NULL) \
|
||||
abort ();
|
||||
do \
|
||||
{ \
|
||||
if ((H)->dynindx == -1 \
|
||||
|| ((H)->root.type != bfd_link_hash_defined \
|
||||
&& (H)->root.type != bfd_link_hash_defweak) \
|
||||
|| (HTAB)->elf.srelbss == NULL \
|
||||
|| (HTAB)->elf.sreldynrelro == NULL) \
|
||||
abort (); \
|
||||
} \
|
||||
while (0);
|
||||
|
||||
/* x86 ELF linker hash entry. */
|
||||
|
||||
|
|
Loading…
Reference in New Issue