diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2015-02-26 17:40:57 +0100 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2015-02-26 17:40:57 +0100 |
| commit | 081a1c2cede38dfb837e3d89539416fd836be4fe (patch) | |
| tree | 21501b9edc44ff08b4d2e7647d94dc3df1230f57 /gdb/compile | |
| parent | 2f41223f62de5d893bd6a4bd832293c2c3e80d91 (diff) | |
| download | gdb-081a1c2cede38dfb837e3d89539416fd836be4fe.zip gdb-081a1c2cede38dfb837e3d89539416fd836be4fe.tar.gz gdb-081a1c2cede38dfb837e3d89539416fd836be4fe.tar.bz2 | |
compile: Fix GNU-IFUNC funcs called from injected code
One could not call IFUNCs (=indirect functions) from the compiled injected
code. Either it errored with:
gdb command line:1:1: error: function return type cannot be function
or it just called the IFUNC dispatcher in normal way, returning real function
implementation address instead of the function return value (and thus no
function was called).
gdb/ChangeLog
2015-02-26 Jan Kratochvil <jan.kratochvil@redhat.com>
* compile/compile-c-symbols.c (convert_one_symbol, convert_symbol_bmsym)
(gcc_symbol_address): Call gnu_ifunc_resolve_addr.
gdb/testsuite/ChangeLog
2015-02-26 Jan Kratochvil <jan.kratochvil@redhat.com>
* gdb.compile/compile-ifunc.c: New file.
* gdb.compile/compile-ifunc.exp: New file.
Diffstat (limited to 'gdb/compile')
| -rw-r--r-- | gdb/compile/compile-c-symbols.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/gdb/compile/compile-c-symbols.c b/gdb/compile/compile-c-symbols.c index 6562f05..75c093f 100644 --- a/gdb/compile/compile-c-symbols.c +++ b/gdb/compile/compile-c-symbols.c @@ -187,6 +187,8 @@ convert_one_symbol (struct compile_c_instance *context, case LOC_BLOCK: kind = GCC_C_SYMBOL_FUNCTION; addr = BLOCK_START (SYMBOL_BLOCK_VALUE (sym)); + if (is_global && TYPE_GNU_IFUNC (SYMBOL_TYPE (sym))) + addr = gnu_ifunc_resolve_addr (target_gdbarch (), addr); break; case LOC_CONST: @@ -365,6 +367,8 @@ convert_symbol_bmsym (struct compile_c_instance *context, gcc_decl decl; CORE_ADDR addr; + addr = MSYMBOL_VALUE_ADDRESS (objfile, msym); + /* Conversion copied from write_exp_msymbol. */ switch (MSYMBOL_TYPE (msym)) { @@ -376,8 +380,11 @@ convert_symbol_bmsym (struct compile_c_instance *context, break; case mst_text_gnu_ifunc: - type = objfile_type (objfile)->nodebug_text_gnu_ifunc_symbol; + /* nodebug_text_gnu_ifunc_symbol would cause: + function return type cannot be function */ + type = objfile_type (objfile)->nodebug_text_symbol; kind = GCC_C_SYMBOL_FUNCTION; + addr = gnu_ifunc_resolve_addr (target_gdbarch (), addr); break; case mst_data: @@ -400,7 +407,6 @@ convert_symbol_bmsym (struct compile_c_instance *context, } sym_type = convert_type (context, type); - addr = MSYMBOL_VALUE_ADDRESS (objfile, msym); decl = C_CTX (context)->c_ops->build_decl (C_CTX (context), MSYMBOL_NATURAL_NAME (msym), kind, sym_type, NULL, addr, @@ -497,6 +503,8 @@ gcc_symbol_address (void *datum, struct gcc_c_context *gcc_context, "gcc_symbol_address \"%s\": full symbol\n", identifier); result = BLOCK_START (SYMBOL_BLOCK_VALUE (sym)); + if (TYPE_GNU_IFUNC (SYMBOL_TYPE (sym))) + result = gnu_ifunc_resolve_addr (target_gdbarch (), result); found = 1; } else @@ -512,6 +520,8 @@ gcc_symbol_address (void *datum, struct gcc_c_context *gcc_context, "symbol\n", identifier); result = BMSYMBOL_VALUE_ADDRESS (msym); + if (MSYMBOL_TYPE (msym.minsym) == mst_text_gnu_ifunc) + result = gnu_ifunc_resolve_addr (target_gdbarch (), result); found = 1; } } |