summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Jacobowitz <drow@false.org>2002-09-23 22:14:53 +0000
committerDaniel Jacobowitz <drow@false.org>2002-09-23 22:14:53 +0000
commit74abbb4d1fcaef469ea3977fd45b3bb33bc2c7c5 (patch)
treec933c6c08aede60be762820b91e48eb48e88c361
parent1ad1834b741938a7ae1df0716f11a6094e6e0c98 (diff)
downloadcygnal-74abbb4d1fcaef469ea3977fd45b3bb33bc2c7c5.tar.gz
cygnal-74abbb4d1fcaef469ea3977fd45b3bb33bc2c7c5.tar.bz2
cygnal-74abbb4d1fcaef469ea3977fd45b3bb33bc2c7c5.zip
2002-09-23 Daniel Jacobowitz <drow@mvista.com>
Merge from mainline: 2002-09-19 Jakub Jelinek <jakub@redhat.com> * elf/i386.h (R_386_TLS_TPOFF, R_386_TLS_IE, R_386_TLS_GOTIE): Define. 2002-09-19 Nathan Tallent <eraxxon@alumni.rice.edu> * dis-asm.h: Remove (errant) trailing semicolon (;) from the extern "C" { } declaration. 2002-09-04 Nick Clifton <nickc@redhat.com> * dis-asm.h (print_ppc_disassembler_options): Prototype. 2002-08-06 H.J. Lu <hjl@gnu.org> * bfdlink.h (bfd_link_info): Add allow_undefined_version. (bfd_elf_version_expr): Add symver and script.
-rw-r--r--include/ChangeLog18
-rw-r--r--include/bfdlink.h7
-rw-r--r--include/dis-asm.h3
-rw-r--r--include/elf/i386.h5
4 files changed, 31 insertions, 2 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index cae894a54..786e08bcd 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,21 @@
+2002-09-23 Daniel Jacobowitz <drow@mvista.com>
+
+ Merge from mainline:
+ 2002-09-19 Jakub Jelinek <jakub@redhat.com>
+ * elf/i386.h (R_386_TLS_TPOFF, R_386_TLS_IE, R_386_TLS_GOTIE):
+ Define.
+
+ 2002-09-19 Nathan Tallent <eraxxon@alumni.rice.edu>
+ * dis-asm.h: Remove (errant) trailing semicolon (;) from the
+ extern "C" { } declaration.
+
+ 2002-09-04 Nick Clifton <nickc@redhat.com>
+ * dis-asm.h (print_ppc_disassembler_options): Prototype.
+
+ 2002-08-06 H.J. Lu <hjl@gnu.org>
+ * bfdlink.h (bfd_link_info): Add allow_undefined_version.
+ (bfd_elf_version_expr): Add symver and script.
+
2002-07-10 Jakub Jelinek <jakub@redhat.com>
* elf/common.h (SHT_GNU_LIBLIST, DT_GNU_PRELINKED,
diff --git a/include/bfdlink.h b/include/bfdlink.h
index 63f5ecd74..d83ff9420 100644
--- a/include/bfdlink.h
+++ b/include/bfdlink.h
@@ -254,6 +254,9 @@ struct bfd_link_info
/* true if ok to have multiple definition. */
boolean allow_multiple_definition;
+ /* true if ok to have version with no definition. */
+ boolean allow_undefined_version;
+
/* Which symbols to strip. */
enum bfd_link_strip strip;
@@ -590,6 +593,10 @@ struct bfd_elf_version_expr
const char *pattern;
/* Matching function. */
int (*match) PARAMS((struct bfd_elf_version_expr *, const char *));
+ /* Defined by ".symver". */
+ unsigned int symver: 1;
+ /* Defined by version script. */
+ unsigned int script : 1;
};
/* Version dependencies. */
diff --git a/include/dis-asm.h b/include/dis-asm.h
index e036fef0b..fa7260803 100644
--- a/include/dis-asm.h
+++ b/include/dis-asm.h
@@ -241,6 +241,7 @@ extern int print_insn_frv PARAMS ((bfd_vma, disassemble_info *));
extern disassembler_ftype arc_get_disassembler PARAMS ((void *));
extern disassembler_ftype cris_get_disassembler PARAMS ((bfd *));
+extern void print_ppc_disassembler_options PARAMS ((FILE *));
extern void print_arm_disassembler_options PARAMS ((FILE *));
extern void parse_arm_disassembler_option PARAMS ((char *));
extern int get_arm_regname_num_options PARAMS ((void));
@@ -315,7 +316,7 @@ extern int generic_symbol_at_address
(INFO).insn_info_valid = 0
#ifdef __cplusplus
-};
+}
#endif
#endif /* ! defined (DIS_ASM_H) */
diff --git a/include/elf/i386.h b/include/elf/i386.h
index c6e9709a1..95941196c 100644
--- a/include/elf/i386.h
+++ b/include/elf/i386.h
@@ -36,7 +36,10 @@ START_RELOC_NUMBERS (elf_i386_reloc_type)
RELOC_NUMBER (R_386_GOTPC, 10) /* 32 bit PC relative offset to GOT */
RELOC_NUMBER (R_386_32PLT, 11) /* Used by Sun */
FAKE_RELOC (FIRST_INVALID_RELOC, 12)
- FAKE_RELOC (LAST_INVALID_RELOC, 16)
+ FAKE_RELOC (LAST_INVALID_RELOC, 13)
+ RELOC_NUMBER (R_386_TLS_TPOFF,14)
+ RELOC_NUMBER (R_386_TLS_IE, 15)
+ RELOC_NUMBER (R_386_TLS_GOTIE,16)
RELOC_NUMBER (R_386_TLS_LE, 17)
RELOC_NUMBER (R_386_TLS_GD, 18)
RELOC_NUMBER (R_386_TLS_LDM, 19)