From 4981a31d523de41713fc40aa8101b4d73d44df57 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 12 Jan 2023 16:46:23 +1030 Subject: Use __func__ rather than __FUNCTION__ We already use C99's __func__ in places, use it more generally. This patch doesn't change uses in the testsuite. I've also left one in gold.h that is protected by GCC_VERSION < 4003. If any of the remaining uses bothers anyone I invite patches. bfd/ * bfd-in.h: Replace __FUNCTION__ with __func__. * elf32-bfin.c: Likewise. * elfnn-aarch64.c: Likewise. * elfxx-sparc.c: Likewise. * bfd-in2.h: Regenerate. gas/ * config/tc-cris.c: Replace __FUNCTION__ with __func__. * config/tc-m68hc11.c: Likewise. * config/tc-msp430.c: Likewise. gold/ * dwp.h: Replace __FUNCTION__ with __func__. * gold.h: Likewise, except for use inside GCC_VERSION < 4003. ld/ * emultempl/pe.em: Replace __FUNCTION__ with __func__. * emultempl/pep.em: Likewise. * pe-dll.c: Likewise. --- ld/emultempl/pe.em | 4 ++-- ld/emultempl/pep.em | 4 ++-- ld/pe-dll.c | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'ld') diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em index 323724b..0413d07 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em @@ -1188,7 +1188,7 @@ pe_fixup_stdcalls (void) struct bfd_link_hash_entry *undef, *sym; if (pe_dll_extra_pe_debug) - printf ("%s\n", __FUNCTION__); + printf ("%s\n", __func__); for (undef = link_info.hash->undefs; undef; undef=undef->u.undef.next) if (undef->type == bfd_link_hash_undefined) @@ -1461,7 +1461,7 @@ gld${EMULATION_NAME}_after_open (void) bfd *a; struct bfd_link_hash_entry *sym; - printf ("%s()\n", __FUNCTION__); + printf ("%s()\n", __func__); for (sym = link_info.hash->undefs; sym; sym=sym->u.undef.next) printf ("-%s\n", sym->root.string); diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em index f0e678b..0bdac8f 100644 --- a/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em @@ -1122,7 +1122,7 @@ pep_fixup_stdcalls (void) struct bfd_link_hash_entry *undef, *sym; if (pep_dll_extra_pe_debug) - printf ("%s\n", __FUNCTION__); + printf ("%s\n", __func__); for (undef = link_info.hash->undefs; undef; undef=undef->u.undef.next) if (undef->type == bfd_link_hash_undefined) @@ -1466,7 +1466,7 @@ gld${EMULATION_NAME}_after_open (void) bfd *a; struct bfd_link_hash_entry *sym; - printf ("%s()\n", __FUNCTION__); + printf ("%s()\n", __func__); for (sym = link_info.hash->undefs; sym; sym=sym->u.undef.next) printf ("-%s\n", sym->root.string); diff --git a/ld/pe-dll.c b/ld/pe-dll.c index a2584c3..0248f4b 100644 --- a/ld/pe-dll.c +++ b/ld/pe-dll.c @@ -1421,7 +1421,7 @@ pe_find_data_imports (const char *symhead, char *impname; if (pe_dll_extra_pe_debug) - printf ("%s:%s\n", __FUNCTION__, undef->root.string); + printf ("%s:%s\n", __func__, undef->root.string); strcpy (name, undef->root.string); impname = name - (sizeof "__imp_" - 1); @@ -3501,7 +3501,7 @@ pe_implied_import_dll (const char *filename) if (pe_dll_extra_pe_debug) printf ("%s %s: 0x%08lx-0x%08lx (0x%08lx)\n", - __FUNCTION__, sec_name, (unsigned long) vaddr, + __func__, sec_name, (unsigned long) vaddr, (unsigned long) (vaddr + vsize), (unsigned long) flags); } else if (strcmp(sec_name,".rdata") == 0) @@ -3511,7 +3511,7 @@ pe_implied_import_dll (const char *filename) if (pe_dll_extra_pe_debug) printf ("%s %s: 0x%08lx-0x%08lx (0x%08lx)\n", - __FUNCTION__, sec_name, (unsigned long) vaddr, + __func__, sec_name, (unsigned long) vaddr, (unsigned long) (vaddr + vsize), (unsigned long) flags); } else if (strcmp (sec_name,".bss") == 0) @@ -3521,7 +3521,7 @@ pe_implied_import_dll (const char *filename) if (pe_dll_extra_pe_debug) printf ("%s %s: 0x%08lx-0x%08lx (0x%08lx)\n", - __FUNCTION__, sec_name, (unsigned long) vaddr, + __func__, sec_name, (unsigned long) vaddr, (unsigned long) (vaddr + vsize), (unsigned long) flags); } } @@ -3579,7 +3579,7 @@ pe_implied_import_dll (const char *filename) if (pe_dll_extra_pe_debug) printf ("%s dll-name: %s sym: %s addr: 0x%lx %s\n", - __FUNCTION__, dllname, erva + name_rva, + __func__, dllname, erva + name_rva, (unsigned long) func_rva, is_data ? "(data)" : ""); } @@ -3616,7 +3616,7 @@ pe_implied_import_dll (const char *filename) if (pe_dll_extra_pe_debug) printf ("%s dll-name: %s sym: %s addr: 0x%lx %s\n", - __FUNCTION__, dllname, erva + name_rva, + __func__, dllname, erva + name_rva, (unsigned long) func_rva, is_data ? "(data)" : ""); } } -- cgit v1.1