From 99f6fdd9eb60f5b8b9b172b1b2cfa627be566a9d Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Mon, 18 Nov 2019 12:13:24 +0000 Subject: [PATCH] binutils: Make some functions static in dwarf.c The architecture specific register name initialisation routines no longer need to be externally visible, so make them static. binutils/ChangeLog: * dwarf.c (init_dwarf_regnames_i386): Make static. (init_dwarf_regnames_iamcu): Make static. (init_dwarf_regnames_x86_64): Make static. (init_dwarf_regnames_aarch64): Make static. (init_dwarf_regnames_s390): Make static. (init_dwarf_regnames_riscv): Make static. * dwarf.h (init_dwarf_regnames_i386): Delete declaration. (init_dwarf_regnames_iamcu): Delete declaration. (init_dwarf_regnames_x86_64): Delete declaration. (init_dwarf_regnames_aarch64): Delete declaration. (init_dwarf_regnames_s390): Delete declaration. (init_dwarf_regnames_riscv): Delete declaration. Change-Id: I9e350f76f98f46e9e3dd88d502f2a2a83e44cb36 --- binutils/ChangeLog | 15 +++++++++++++++ binutils/dwarf.c | 12 ++++++------ binutils/dwarf.h | 6 ------ 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index c7cb68ca81a..8251db21111 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,18 @@ +2019-11-22 Andrew Burgess + + * dwarf.c (init_dwarf_regnames_i386): Make static. + (init_dwarf_regnames_iamcu): Make static. + (init_dwarf_regnames_x86_64): Make static. + (init_dwarf_regnames_aarch64): Make static. + (init_dwarf_regnames_s390): Make static. + (init_dwarf_regnames_riscv): Make static. + * dwarf.h (init_dwarf_regnames_i386): Delete declaration. + (init_dwarf_regnames_iamcu): Delete declaration. + (init_dwarf_regnames_x86_64): Delete declaration. + (init_dwarf_regnames_aarch64): Delete declaration. + (init_dwarf_regnames_s390): Delete declaration. + (init_dwarf_regnames_riscv): Delete declaration. + 2019-11-22 Andrew Burgess * dwarf.c (init_dwarf_regnames_by_bfd_arch_and_mach): New diff --git a/binutils/dwarf.c b/binutils/dwarf.c index a770c57f608..fc73fa75a6a 100644 --- a/binutils/dwarf.c +++ b/binutils/dwarf.c @@ -7464,14 +7464,14 @@ static const char *const dwarf_regnames_iamcu[] = NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL /* 93 - 100 */ }; -void +static void init_dwarf_regnames_i386 (void) { dwarf_regnames = dwarf_regnames_i386; dwarf_regnames_count = ARRAY_SIZE (dwarf_regnames_i386); } -void +static void init_dwarf_regnames_iamcu (void) { dwarf_regnames = dwarf_regnames_iamcu; @@ -7510,7 +7510,7 @@ static const char *const dwarf_regnames_x86_64[] = "k0", "k1", "k2", "k3", "k4", "k5", "k6", "k7" }; -void +static void init_dwarf_regnames_x86_64 (void) { dwarf_regnames = dwarf_regnames_x86_64; @@ -7537,7 +7537,7 @@ static const char *const dwarf_regnames_aarch64[] = "z24", "z25", "z26", "z27", "z28", "z29", "z30", "z31", }; -void +static void init_dwarf_regnames_aarch64 (void) { dwarf_regnames = dwarf_regnames_aarch64; @@ -7561,7 +7561,7 @@ static const char *const dwarf_regnames_s390[] = "v24", "v26", "v28", "v30", "v25", "v27", "v29", "v31", }; -void +static void init_dwarf_regnames_s390 (void) { dwarf_regnames = dwarf_regnames_s390; @@ -7582,7 +7582,7 @@ static const char *const dwarf_regnames_riscv[] = "ft8", "ft9", "ft10", "ft11" /* 60 - 63 */ }; -void +static void init_dwarf_regnames_riscv (void) { dwarf_regnames = dwarf_regnames_riscv; diff --git a/binutils/dwarf.h b/binutils/dwarf.h index 8272de857b5..5ea85d920a1 100644 --- a/binutils/dwarf.h +++ b/binutils/dwarf.h @@ -228,12 +228,6 @@ extern int dwarf_check; extern void init_dwarf_regnames_by_elf_machine_code (unsigned int); extern void init_dwarf_regnames_by_bfd_arch_and_mach (enum bfd_architecture arch, unsigned long mach); -extern void init_dwarf_regnames_i386 (void); -extern void init_dwarf_regnames_iamcu (void); -extern void init_dwarf_regnames_x86_64 (void); -extern void init_dwarf_regnames_aarch64 (void); -extern void init_dwarf_regnames_s390 (void); -extern void init_dwarf_regnames_riscv (void); extern bfd_boolean load_debug_section (enum dwarf_section_display_enum, void *); extern void free_debug_section (enum dwarf_section_display_enum); -- 2.30.2