diff options
| author | Ulrich Drepper <[email protected]> | 2008-01-20 16:43:15 +0000 |
|---|---|---|
| committer | Ulrich Drepper <[email protected]> | 2008-01-20 16:43:15 +0000 |
| commit | d9488292be8c78615163eb4733e105143cb7b7ba (patch) | |
| tree | 621b2fe78b107946d4858e7de6bc88d5c9533172 /src/i386_ld.c | |
| parent | 580e6b85aaf8e09bddcaa1162d74b3b6ceef8a52 (diff) | |
merge of '1d8389d494f774b4ccf384252ddac47cc2809542'
and 'f4a5bcbfbb71389b11bac53c8ec50011dc7e4c3c'
Diffstat (limited to 'src/i386_ld.c')
| -rw-r--r-- | src/i386_ld.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/i386_ld.c b/src/i386_ld.c index c79804cd..82fb9473 100644 --- a/src/i386_ld.c +++ b/src/i386_ld.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Red Hat, Inc. +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008 Red Hat, Inc. This file is part of Red Hat elfutils. Written by Ulrich Drepper <[email protected]>, 2001. @@ -592,10 +592,9 @@ elf_i386_count_relocations (struct ld_state *statep, struct scninfo *scninfo) If the symbol is not defined and we are not creating a statically linked binary, then we need in any case a PLT entry. */ - if (! scninfo->fileinfo->symref[r_sym]->defined) + if (! scninfo->fileinfo->symref[r_sym]->defined + && !statep->statically) { - assert (!statep->statically); - sym = scninfo->fileinfo->symref[r_sym]; sym->type = STT_FUNC; sym->in_dso = 1; @@ -614,6 +613,9 @@ elf_i386_count_relocations (struct ld_state *statep, struct scninfo *scninfo) } break; + case R_386_TLS_IE: + case R_386_TLS_GOTIE: + case R_386_TLS_LE: case R_386_TLS_GD: case R_386_TLS_LDM: case R_386_TLS_GD_32: |