| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * ELF object format helpers - x86:x86 | 2  * ELF object format helpers - x86:x86 | 
| 3  * | 3  * | 
| 4  *  Copyright (C) 2004-2007  Michael Urman | 4  *  Copyright (C) 2004-2007  Michael Urman | 
| 5  * | 5  * | 
| 6  * Redistribution and use in source and binary forms, with or without | 6  * Redistribution and use in source and binary forms, with or without | 
| 7  * modification, are permitted provided that the following conditions | 7  * modification, are permitted provided that the following conditions | 
| 8  * are met: | 8  * are met: | 
| 9  * 1. Redistributions of source code must retain the above copyright | 9  * 1. Redistributions of source code must retain the above copyright | 
| 10  *    notice, this list of conditions and the following disclaimer. | 10  *    notice, this list of conditions and the following disclaimer. | 
| 11  * 2. Redistributions in binary form must reproduce the above copyright | 11  * 2. Redistributions in binary form must reproduce the above copyright | 
| 12  *    notice, this list of conditions and the following disclaimer in the | 12  *    notice, this list of conditions and the following disclaimer in the | 
| 13  *    documentation and/or other materials provided with the distribution. | 13  *    documentation and/or other materials provided with the distribution. | 
| 14  * | 14  * | 
| 15  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND OTHER CONTRIBUTORS ``AS IS'' | 15  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND OTHER CONTRIBUTORS ``AS IS'' | 
| 16  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 16  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 
| 17  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 17  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 
| 18  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR OTHER CONTRIBUTORS BE | 18  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR OTHER CONTRIBUTORS BE | 
| 19  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 19  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 
| 20  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 20  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 
| 21  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 21  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 
| 22  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 22  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 
| 23  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 23  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 
| 24  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 24  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 
| 25  * POSSIBILITY OF SUCH DAMAGE. | 25  * POSSIBILITY OF SUCH DAMAGE. | 
| 26  */ | 26  */ | 
| 27 | 27 | 
| 28 #include <util.h> | 28 #include <util.h> | 
| 29 /*@unused@*/ RCSID("$Id: elf-x86-x86.c 2321 2010-05-15 07:45:48Z peter $"); |  | 
| 30 | 29 | 
| 31 #include <libyasm.h> | 30 #include <libyasm.h> | 
| 32 #define YASM_OBJFMT_ELF_INTERNAL | 31 #define YASM_OBJFMT_ELF_INTERNAL | 
| 33 #include "elf.h" | 32 #include "elf.h" | 
| 34 #include "elf-machine.h" | 33 #include "elf-machine.h" | 
| 35 | 34 | 
| 36 static const elf_machine_ssym elf_x86_x86_ssyms[] = { | 35 static elf_machine_ssym elf_x86_x86_ssyms[] = { | 
| 37     {"plt",         ELF_SSYM_SYM_RELATIVE,  R_386_PLT32,        32}, | 36     {"plt",         ELF_SSYM_SYM_RELATIVE,  R_386_PLT32,        32}, | 
| 38     {"gotoff",      0,                      R_386_GOTOFF,       32}, | 37     {"gotoff",      0,                      R_386_GOTOFF,       32}, | 
| 39     /* special one for NASM */ | 38     /* special one for NASM */ | 
| 40     {"gotpc",       ELF_SSYM_CURPOS_ADJUST, R_386_GOTPC,        32}, | 39     {"gotpc",       ELF_SSYM_CURPOS_ADJUST, R_386_GOTPC,        32}, | 
| 41     {"tlsgd",       ELF_SSYM_SYM_RELATIVE|ELF_SSYM_THREAD_LOCAL, | 40     {"tlsgd",       ELF_SSYM_SYM_RELATIVE|ELF_SSYM_THREAD_LOCAL, | 
| 42                     R_386_TLS_GD,       32}, | 41                     R_386_TLS_GD,       32}, | 
| 43     {"tlsldm",      ELF_SSYM_SYM_RELATIVE|ELF_SSYM_THREAD_LOCAL, | 42     {"tlsldm",      ELF_SSYM_SYM_RELATIVE|ELF_SSYM_THREAD_LOCAL, | 
| 44                     R_386_TLS_LDM,      32}, | 43                     R_386_TLS_LDM,      32}, | 
| 45     {"gottpoff",    ELF_SSYM_SYM_RELATIVE|ELF_SSYM_THREAD_LOCAL, | 44     {"gottpoff",    ELF_SSYM_SYM_RELATIVE|ELF_SSYM_THREAD_LOCAL, | 
| 46                     R_386_TLS_IE_32,    32}, | 45                     R_386_TLS_IE_32,    32}, | 
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 234     elf_x86_x86_write_secthead, | 233     elf_x86_x86_write_secthead, | 
| 235     elf_x86_x86_write_secthead_rel, | 234     elf_x86_x86_write_secthead_rel, | 
| 236     elf_x86_x86_handle_reloc_addend, | 235     elf_x86_x86_handle_reloc_addend, | 
| 237     elf_x86_x86_map_reloc_info_to_type, | 236     elf_x86_x86_map_reloc_info_to_type, | 
| 238     elf_x86_x86_write_reloc, | 237     elf_x86_x86_write_reloc, | 
| 239     elf_x86_x86_write_proghead, | 238     elf_x86_x86_write_proghead, | 
| 240     elf_x86_x86_ssyms, | 239     elf_x86_x86_ssyms, | 
| 241     sizeof(elf_x86_x86_ssyms)/sizeof(elf_x86_x86_ssyms[0]), | 240     sizeof(elf_x86_x86_ssyms)/sizeof(elf_x86_x86_ssyms[0]), | 
| 242     32 | 241     32 | 
| 243 }; | 242 }; | 
| OLD | NEW | 
|---|