diff options
| author | Ian Lance Taylor <ian@airs.com> | 2011-07-08 23:49:11 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 2011-07-08 23:49:11 +0000 |
| commit | 62855347684cda4254e2b8f1f80ed95e18ab5b76 (patch) | |
| tree | ac7dc032f7360ae5b1af58c18bb26d0495c1dcc7 /gold/symtab.h | |
| parent | 67181c72fbaad59e5793cf6bcb8d12d7d211c817 (diff) | |
| download | fsf-binutils-gdb-62855347684cda4254e2b8f1f80ed95e18ab5b76.zip fsf-binutils-gdb-62855347684cda4254e2b8f1f80ed95e18ab5b76.tar.gz fsf-binutils-gdb-62855347684cda4254e2b8f1f80ed95e18ab5b76.tar.bz2 | |
PR gold/12279
* resolve.cc (Symbol_table::should_override): Add fromtype
parameter. Change all callers. Give error when linking together
TLS and non-TLS symbol.
(Symbol_table::should_override_with_special): Add fromtype
parameter. Change all callers.
* i386.cc (Target_i386::Relocate::relocate_tls): Don't crash if
there is no TLS segment if we have reported some errors.
* x86_64.cc (Target_x86_64::relocate_tls): Likewise.
Diffstat (limited to 'gold/symtab.h')
| -rw-r--r-- | gold/symtab.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gold/symtab.h b/gold/symtab.h index 9ba9c08..e2aa6a7 100644 --- a/gold/symtab.h +++ b/gold/symtab.h @@ -1661,7 +1661,8 @@ class Symbol_table // Whether we should override a symbol, based on flags in // resolve.cc. static bool - should_override(const Symbol*, unsigned int, Defined, Object*, bool*, bool*); + should_override(const Symbol*, unsigned int, elfcpp::STT, Defined, + Object*, bool*, bool*); // Report a problem in symbol resolution. static void @@ -1679,7 +1680,7 @@ class Symbol_table // Whether we should override a symbol with a special symbol which // is automatically defined by the linker. static bool - should_override_with_special(const Symbol*, Defined); + should_override_with_special(const Symbol*, elfcpp::STT, Defined); // Override a symbol with a special symbol. template<int size> |