Update our yasm copy to yasm 1.1.0 (Part 1: yasm side)...

third_party/yasm/patched-yasm/modules/objfmts/elf/elf.h

-/* $Id: elf.h 2040 2008-02-21 08:57:23Z peter $
+/* $Id: elf.h 2208 2009-07-22 05:45:03Z peter $
  * ELF object format helpers
  *
  *  Copyright (C) 2003-2007  Michael Urman
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 284 matching lines @@
     R_386_TLS_GD_POP = 27,      /* Tag for popl in GD TLS code */
     R_386_TLS_LDM_32 = 28,      /* Direct 32 bit for local dynamic code */
     R_386_TLS_LDM_PUSH = 29,    /* Tag for pushl in LDM TLS code */
     R_386_TLS_LDM_CALL = 30,    /* Relocation for call to */
     R_386_TLS_LDM_POP = 31,     /* Tag for popl in LDM TLS code */
     R_386_TLS_LDO_32 = 32,      /* Offset relative to TLS block */
     R_386_TLS_IE_32 = 33,       /* GOT entry for static TLS block */
     R_386_TLS_LE_32 = 34,       /* Offset relative to static TLS block */
     R_386_TLS_DTPMOD32 = 35,    /* ID of module containing symbol */
     R_386_TLS_DTPOFF32 = 36,    /* Offset in TLS block */
-    R_386_TLS_TPOFF32 = 37      /* Offset in static TLS block */
+    R_386_TLS_TPOFF32 = 37,     /* Offset in static TLS block */
+    R_386_TLS_GOTDESC = 39,
+    R_386_TLS_DESC_CALL = 40,
+    R_386_TLS_DESC = 41
 } elf_386_relocation_type;
 
 typedef enum {
     R_X86_64_NONE = 0,          /* none */
     R_X86_64_64 = 1,            /* word64, S + A */
     R_X86_64_PC32 = 2,          /* word32, S + A - P */
     R_X86_64_GOT32 = 3,         /* word32, G + A */
     R_X86_64_PLT32 = 4,         /* word32, L + A - P */
     R_X86_64_COPY = 5,          /* none */
     R_X86_64_GLOB_DAT = 6,      /* word64, S, set GOT entry to data address */
     R_X86_64_JMP_SLOT = 7,      /* word64, S, set GOT entry to code address */
     R_X86_64_RELATIVE = 8,      /* word64, B + A */
     R_X86_64_GOTPCREL = 9,      /* word32, G + GOT + A - P */
     R_X86_64_32 = 10,           /* word32 (zero extend), S + A */
     R_X86_64_32S = 11,          /* word32 (sign extend), S + A */
     R_X86_64_16 = 12,           /* word16, S + A */
     R_X86_64_PC16 = 13,         /* word16, S + A - P */
     R_X86_64_8 = 14,            /* word8, S + A */
     R_X86_64_PC8 = 15,          /* word8, S + A - P */
     R_X86_64_DPTMOD64 = 16,     /* word64, ID of module containing symbol */
     R_X86_64_DTPOFF64 = 17,     /* word64, offset in TLS block */
     R_X86_64_TPOFF64 = 18,      /* word64, offset in initial TLS block */
     R_X86_64_TLSGD = 19,        /* word32, PC-rel offset to GD GOT block */
     R_X86_64_TLSLD = 20,        /* word32, PC-rel offset to LD GOT block */
     R_X86_64_DTPOFF32 = 21,     /* word32, offset to TLS block */
     R_X86_64_GOTTPOFF = 22,     /* word32, PC-rel offset to IE GOT entry */
-    R_X86_64_TPOFF32 = 23       /* word32, offset in initial TLS block */
+    R_X86_64_TPOFF32 = 23,      /* word32, offset in initial TLS block */
+    R_X86_64_PC64 = 24,         /* word64, PC relative */
+    R_X86_64_GOTOFF64 = 25,     /* word64, offset to GOT */
+    R_X86_64_GOTPC32 = 26,      /* word32, signed pc relative to GOT */
+    R_X86_64_GOT64 = 27,        /* word64, GOT entry offset */
+    R_X86_64_GOTPCREL64 = 28,   /* word64, signed pc relative to GOT entry */
+    R_X86_64_GOTPC64 = 29,      /* word64, signed pc relative to GOT */
+    R_X86_64_GOTPLT64 = 30,     /* like GOT64, but indicates PLT entry needed */
+    R_X86_64_PLTOFF64 = 31,     /* word64, GOT relative offset to PLT entry */
+    R_X86_64_GOTPC32_TLSDESC = 34, /* GOT offset for TLS descriptor */
+    R_X86_64_TLSDESC_CALL = 35, /* Marker for call through TLS descriptor */
+    R_X86_64_TLSDESC = 36       /* TLS descriptor */
 } elf_x86_64_relocation_type;
 
 struct elf_secthead {
     elf_section_type     type;
     elf_section_flags    flags;
     elf_address          offset;
     yasm_intnum         *size;
     elf_section_index    link;
     elf_section_info     info;      /* see note ESD1 */
     unsigned long        align;
@@ skipping 26 matching lines @@
  *     link -> SHN_UNDEF
  *     info -> 0
  */
 
 struct elf_reloc_entry {
     yasm_reloc           reloc;
     int                  rtype_rel;
     size_t               valsize;
     yasm_intnum         *addend;
     /*@null@*/ yasm_symrec *wrt;
+    int                  is_GOT_sym;
 };
 
 STAILQ_HEAD(elf_strtab_head, elf_strtab_entry);
 struct elf_strtab_entry {
     STAILQ_ENTRY(elf_strtab_entry) qlink;
     unsigned long        index;
     char                *str;
 };
 
 STAILQ_HEAD(elf_symtab_head, elf_symtab_entry);
@@ skipping 10 matching lines @@
     elf_symbol_binding   bind;
     elf_symbol_type      type;
     elf_symbol_vis       vis;
     elf_symbol_index     symindex;
 };
 
 #endif /* defined(YASM_OBJFMT_ELF_INTERNAL) */
 
 extern const yasm_assoc_data_callback elf_section_data;
 extern const yasm_assoc_data_callback elf_symrec_data;
+extern const yasm_assoc_data_callback elf_ssym_symrec_data;
 
 
 const elf_machine_handler *elf_set_arch(struct yasm_arch *arch,
                                         yasm_symtab *symtab,
                                         int bits_pref);
 
 yasm_symrec *elf_get_special_sym(const char *name, const char *parser);
 
 /* reloc functions */
 int elf_is_wrt_sym_relative(yasm_symrec *wrt);
 int elf_is_wrt_pos_adjusted(yasm_symrec *wrt);
 elf_reloc_entry *elf_reloc_entry_create(yasm_symrec *sym,
                                         /*@null@*/ yasm_symrec *wrt,
                                         yasm_intnum *addr,
                                         int rel,
-                                        size_t valsize);
+                                        size_t valsize,
+                                        int is_GOT_sym);
 void elf_reloc_entry_destroy(void *entry);
 
 /* strtab functions */
 elf_strtab_entry *elf_strtab_entry_create(const char *str);
 void elf_strtab_entry_set_str(elf_strtab_entry *entry, const char *str);
 elf_strtab_head *elf_strtab_create(void);
 elf_strtab_entry *elf_strtab_append_str(elf_strtab_head *head, const char *str);
 void elf_strtab_destroy(elf_strtab_head *head);
 unsigned long elf_strtab_output_to_file(FILE *f, elf_strtab_head *head);
 
@@ skipping 48 matching lines @@
                                         elf_section_index link);
 elf_section_index elf_secthead_set_rel_index(elf_secthead *shead,
                                              elf_section_index sectidx);
 elf_strtab_entry *elf_secthead_set_rel_name(elf_secthead *shead,
                                             elf_strtab_entry *entry);
 elf_size elf_secthead_set_entsize(elf_secthead *shead, elf_size size);
 struct yasm_symrec *elf_secthead_set_sym(elf_secthead *shead,
                                          struct yasm_symrec *sym);
 void elf_secthead_add_size(elf_secthead *shead, yasm_intnum *size);
 char *elf_secthead_name_reloc_section(const char *basesect);
-void elf_handle_reloc_addend(yasm_intnum *intn, elf_reloc_entry *reloc);
+void elf_handle_reloc_addend(yasm_intnum *intn,
+                             elf_reloc_entry *reloc,
+                             unsigned long offset);
 unsigned long elf_secthead_write_rel_to_file(FILE *f, elf_section_index symtab,
                                              yasm_section *sect,
                                              elf_secthead *esd,
                                              elf_section_index sindex);
 unsigned long elf_secthead_write_relocs_to_file(FILE *f, yasm_section *sect,
                                                 elf_secthead *shead,
                                                 yasm_errwarns *errwarns);
 long elf_secthead_set_file_offset(elf_secthead *shead, long pos);
 
 /* program header function */
 unsigned long
 elf_proghead_get_size(void);
 unsigned long
 elf_proghead_write_to_file(FILE *f,
                            elf_offset secthead_addr,
                            unsigned long secthead_count,
                            elf_section_index shstrtab_index);
 
 #endif /* ELF_H_INCLUDED */