From 60f62e2b83eb362c5063247235c111a59e13cad1 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Fri, 28 Jan 2022 10:28:57 -0500 Subject: gdb: remove MSYMBOL_TYPE macro Add a getter and a setter for a minimal symbol's type. Remove the corresponding macro and adjust all callers. Change-Id: I89900df5ffa5687133fe1a16b2e0d4684e67a77d --- gdb/compile/compile-c-symbols.c | 4 ++-- gdb/compile/compile-cplus-symbols.c | 4 ++-- gdb/compile/compile-object-load.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'gdb/compile') diff --git a/gdb/compile/compile-c-symbols.c b/gdb/compile/compile-c-symbols.c index a50e84d..642c0be 100644 --- a/gdb/compile/compile-c-symbols.c +++ b/gdb/compile/compile-c-symbols.c @@ -273,7 +273,7 @@ convert_symbol_bmsym (compile_c_instance *context, addr = msym->value_address (objfile); /* Conversion copied from write_exp_msymbol. */ - switch (MSYMBOL_TYPE (msym)) + switch (msym->type ()) { case mst_text: case mst_file_text: @@ -422,7 +422,7 @@ gcc_symbol_address (void *datum, struct gcc_c_context *gcc_context, "symbol\n", identifier); result = msym.value_address (); - if (MSYMBOL_TYPE (msym.minsym) == mst_text_gnu_ifunc) + if (msym.minsym->type () == mst_text_gnu_ifunc) result = gnu_ifunc_resolve_addr (target_gdbarch (), result); found = 1; } diff --git a/gdb/compile/compile-cplus-symbols.c b/gdb/compile/compile-cplus-symbols.c index b68184c..7ad9ea9 100644 --- a/gdb/compile/compile-cplus-symbols.c +++ b/gdb/compile/compile-cplus-symbols.c @@ -284,7 +284,7 @@ convert_symbol_bmsym (compile_cplus_instance *instance, addr = msym->value_address (objfile); /* Conversion copied from write_exp_msymbol. */ - switch (MSYMBOL_TYPE (msym)) + switch (msym->type ()) { case mst_text: case mst_file_text: @@ -459,7 +459,7 @@ gcc_cplus_symbol_address (void *datum, struct gcc_cp_context *gcc_context, "symbol\n", identifier); result = msym.value_address (); - if (MSYMBOL_TYPE (msym.minsym) == mst_text_gnu_ifunc) + if (msym.minsym->type () == mst_text_gnu_ifunc) result = gnu_ifunc_resolve_addr (target_gdbarch (), result); found = 1; } diff --git a/gdb/compile/compile-object-load.c b/gdb/compile/compile-object-load.c index bfb40c9..dee7882 100644 --- a/gdb/compile/compile-object-load.c +++ b/gdb/compile/compile-object-load.c @@ -766,7 +766,7 @@ compile_object_load (const compile_file_names &file_names, bmsym = lookup_minimal_symbol (sym->name, NULL, NULL); switch (bmsym.minsym == NULL - ? mst_unknown : MSYMBOL_TYPE (bmsym.minsym)) + ? mst_unknown : bmsym.minsym->type ()) { case mst_text: case mst_bss: -- cgit v1.1