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.

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,

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.  */

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) */

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)