diff options
| author | Roland McGrath <[email protected]> | 2008-01-18 21:42:01 +0000 |
|---|---|---|
| committer | Roland McGrath <[email protected]> | 2008-01-18 21:42:01 +0000 |
| commit | 580e6b85aaf8e09bddcaa1162d74b3b6ceef8a52 (patch) | |
| tree | e6b1d13f98106c839eca47f25ebf3e0505e55e00 /src/i386_ld.c | |
| parent | c182f90bd79ac9954a17aaa7792aac3e8103851d (diff) | |
merge of 'aee0b12a9696567adc81ce0bab9a764f6d109392'
and 'f3933ac5f5de522fcd38d0960f642fec00b553fa'
Diffstat (limited to 'src/i386_ld.c')
| -rw-r--r-- | src/i386_ld.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/i386_ld.c b/src/i386_ld.c index 82fb9473..c79804cd 100644 --- a/src/i386_ld.c +++ b/src/i386_ld.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008 Red Hat, Inc. +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Red Hat, Inc. This file is part of Red Hat elfutils. Written by Ulrich Drepper <[email protected]>, 2001. @@ -592,9 +592,10 @@ 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 - && !statep->statically) + if (! scninfo->fileinfo->symref[r_sym]->defined) { + assert (!statep->statically); + sym = scninfo->fileinfo->symref[r_sym]; sym->type = STT_FUNC; sym->in_dso = 1; @@ -613,9 +614,6 @@ 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: |