From 8bc2360162cf54bde0fbd48ad49d851a95288480 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Sat, 26 Oct 2002 17:12:27 +0000 Subject: Merge drow-cplus-merge-20021025 to drow-cplus-branch. --- ChangeLog | 9 +++++++++ configure.in | 9 ++++++++- include/ChangeLog | 4 ++++ include/elf/ChangeLog | 4 ++++ include/elf/sh.h | 16 +++++++++++++--- include/getopt.h | 2 +- include/opcode/ChangeLog | 4 ++++ include/opcode/cgen.h | 16 ++++++++-------- 8 files changed, 51 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index f01dee3aa..8a3bf4567 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-10-24 Hans-Peter Nilsson + + * configure.in (i[3456]86-*-linux*): Add check to disable + ${libgcj} for glibc1. + +2002-10-07 Svein E. Seldal + + * configure.in: Add tic4x target. + 2002-10-03 Nathanael Nerode * Makefile.tpl: Make SET_LIB_PATH substitution more autoconfy. diff --git a/configure.in b/configure.in index 8988bef27..6b714947a 100644 --- a/configure.in +++ b/configure.in @@ -361,7 +361,7 @@ case "${target}" in avr-*-*) noconfigdirs="$noconfigdirs target-libiberty ${libstdcxx_version} ${libgcj}" ;; - c4x-*-*) + c4x-*-* | tic4x-*-*) noconfigdirs="$noconfigdirs ${libstdcxx_version} target-libgloss ${libgcj}" ;; c54x*-*-* | tic54x-*-*) @@ -422,6 +422,13 @@ case "${target}" in noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; i[3456]86-*-linux*) + # The GCC port for glibc1 has no MD_FALLBACK_FRAME_STATE_FOR, so let's + # not build java stuff by default. + case "${target}" in + *-*-*libc1*) + noconfigdirs="$noconfigdirs ${libgcj}";; + esac + # This section makes it possible to build newlib natively on linux. # If we are using a cross compiler then don't configure newlib. if test x${is_cross_compiler} != xno ; then diff --git a/include/ChangeLog b/include/ChangeLog index 257e38193..d7564ef9e 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2002-10-11 David O'Brien + + * getopt.h: getopt is in unistd.h (based on SUSv2). + 2002-09-26 Jakub Jelinek * elf/x86-64.h: Add TLS relocs. diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog index 254b2c425..65f3160af 100644 --- a/include/elf/ChangeLog +++ b/include/elf/ChangeLog @@ -1,3 +1,7 @@ +2002-10-11 Kaz Kojima + + * sh.h: Add SH TLS relocs. + 2002-09-30 Gavin Romig-Koch Ken Raeburn Aldy Hernandez diff --git a/include/elf/sh.h b/include/elf/sh.h index af78c9bb0..ef964d685 100644 --- a/include/elf/sh.h +++ b/include/elf/sh.h @@ -167,7 +167,17 @@ START_RELOC_NUMBERS (elf_sh_reloc_type) RELOC_NUMBER (R_SH_DIR10SL, 50) RELOC_NUMBER (R_SH_DIR10SQ, 51) FAKE_RELOC (R_SH_FIRST_INVALID_RELOC_3, 52) - FAKE_RELOC (R_SH_LAST_INVALID_RELOC_3, 159) + FAKE_RELOC (R_SH_LAST_INVALID_RELOC_3, 143) + RELOC_NUMBER (R_SH_TLS_GD_32, 144) + RELOC_NUMBER (R_SH_TLS_LD_32, 145) + RELOC_NUMBER (R_SH_TLS_LDO_32, 146) + RELOC_NUMBER (R_SH_TLS_IE_32, 147) + RELOC_NUMBER (R_SH_TLS_LE_32, 148) + RELOC_NUMBER (R_SH_TLS_DTPMOD32, 149) + RELOC_NUMBER (R_SH_TLS_DTPOFF32, 150) + RELOC_NUMBER (R_SH_TLS_TPOFF32, 151) + FAKE_RELOC (R_SH_FIRST_INVALID_RELOC_4, 152) + FAKE_RELOC (R_SH_LAST_INVALID_RELOC_4, 159) RELOC_NUMBER (R_SH_GOT32, 160) RELOC_NUMBER (R_SH_PLT32, 161) RELOC_NUMBER (R_SH_COPY, 162) @@ -205,8 +215,8 @@ START_RELOC_NUMBERS (elf_sh_reloc_type) RELOC_NUMBER (R_SH_GLOB_DAT64, 194) RELOC_NUMBER (R_SH_JMP_SLOT64, 195) RELOC_NUMBER (R_SH_RELATIVE64, 196) - FAKE_RELOC (R_SH_FIRST_INVALID_RELOC_4, 197) - FAKE_RELOC (R_SH_LAST_INVALID_RELOC_4, 241) + FAKE_RELOC (R_SH_FIRST_INVALID_RELOC_5, 197) + FAKE_RELOC (R_SH_LAST_INVALID_RELOC_5, 241) RELOC_NUMBER (R_SH_SHMEDIA_CODE, 242) RELOC_NUMBER (R_SH_PT_16, 243) RELOC_NUMBER (R_SH_IMMS16, 244) diff --git a/include/getopt.h b/include/getopt.h index 0c6470b3d..da09cee3b 100644 --- a/include/getopt.h +++ b/include/getopt.h @@ -108,7 +108,7 @@ struct option #if !HAVE_DECL_GETOPT #if defined (__GNU_LIBRARY__) || defined (HAVE_DECL_GETOPT) /* Many other libraries have conflicting prototypes for getopt, with - differences in the consts, in stdlib.h. To avoid compilation + differences in the consts, in unistd.h. To avoid compilation errors, only prototype getopt for the GNU C library. */ extern int getopt (int argc, char *const *argv, const char *shortopts); #else diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog index ab908ec92..af5707e8e 100644 --- a/include/opcode/ChangeLog +++ b/include/opcode/ChangeLog @@ -1,3 +1,7 @@ +2002-10-14 Alan Modra + + * cgen.h: Test __BFD_H_SEEN__ rather than BFD_VERSION_DATE. + 2002-09-30 Gavin Romig-Koch Ken Raeburn Aldy Hernandez diff --git a/include/opcode/cgen.h b/include/opcode/cgen.h index 09c5cbf03..89477985e 100644 --- a/include/opcode/cgen.h +++ b/include/opcode/cgen.h @@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc., Perhaps the definition of bfd_vma can be moved outside of bfd.h. Or perhaps one could duplicate its definition in another file. Until such time, this file conditionally compiles definitions that require - bfd_vma using BFD_VERSION_DATE. */ + bfd_vma using __BFD_H_SEEN__. */ /* Enums must be defined before they can be used. Allow them to be used in struct definitions, even though the enum must @@ -276,7 +276,7 @@ typedef const char * (cgen_parse_fn) PC is the pc value of the insn. The result is an error message or NULL if success. */ -#ifdef BFD_VERSION_DATE +#ifdef __BFD_H_SEEN__ typedef const char * (cgen_insert_fn) PARAMS ((CGEN_CPU_DESC, const CGEN_INSN *insn_, CGEN_FIELDS *fields_, CGEN_INSN_BYTES_PTR insnp_, @@ -297,7 +297,7 @@ typedef const char * (cgen_insert_fn) (); PC is the pc value of the insn. The result is the length of the insn in bits or zero if not recognized. */ -#ifdef BFD_VERSION_DATE +#ifdef __BFD_H_SEEN__ typedef int (cgen_extract_fn) PARAMS ((CGEN_CPU_DESC, const CGEN_INSN *insn_, CGEN_EXTRACT_INFO *ex_info_, CGEN_INSN_INT base_insn_, @@ -316,7 +316,7 @@ typedef int (cgen_extract_fn) (); PC is the pc value of the insn. LEN is the length of the insn, in bits. */ -#ifdef BFD_VERSION_DATE +#ifdef __BFD_H_SEEN__ typedef void (cgen_print_fn) PARAMS ((CGEN_CPU_DESC, PTR info_, const CGEN_INSN *insn_, CGEN_FIELDS *fields_, bfd_vma pc_, int len_)); @@ -381,7 +381,7 @@ enum cgen_parse_operand_result CGEN_PARSE_OPERAND_RESULT_ERROR }; -#ifdef BFD_VERSION_DATE /* Don't require bfd.h unnecessarily. */ +#ifdef __BFD_H_SEEN__ /* Don't require bfd.h unnecessarily. */ typedef const char * (cgen_parse_operand_fn) PARAMS ((CGEN_CPU_DESC, enum cgen_parse_operand_type, const char **, int, int, @@ -565,7 +565,7 @@ const CGEN_KEYWORD_ENTRY *cgen_keyword_search_next extern const char *cgen_parse_keyword PARAMS ((CGEN_CPU_DESC, const char **, CGEN_KEYWORD *, long *)); -#ifdef BFD_VERSION_DATE /* Don't require bfd.h unnecessarily. */ +#ifdef __BFD_H_SEEN__ /* Don't require bfd.h unnecessarily. */ extern const char *cgen_parse_signed_integer PARAMS ((CGEN_CPU_DESC, const char **, int, long *)); extern const char *cgen_parse_unsigned_integer @@ -1253,7 +1253,7 @@ typedef struct cgen_cpu_desc const char * (*parse_operand) PARAMS ((CGEN_CPU_DESC, int opindex_, const char **, CGEN_FIELDS *fields_)); -#ifdef BFD_VERSION_DATE +#ifdef __BFD_H_SEEN__ const char * (*insert_operand) PARAMS ((CGEN_CPU_DESC, int opindex_, CGEN_FIELDS *fields_, CGEN_INSN_BYTES_PTR, bfd_vma pc_)); @@ -1286,7 +1286,7 @@ typedef struct cgen_cpu_desc PARAMS ((CGEN_CPU_DESC, int opindex_, const CGEN_FIELDS *fields_)); void (*set_int_operand) PARAMS ((CGEN_CPU_DESC, int opindex_, CGEN_FIELDS *fields_, int value_)); -#ifdef BFD_VERSION_DATE +#ifdef __BFD_H_SEEN__ bfd_vma (*get_vma_operand) PARAMS ((CGEN_CPU_DESC, int opindex_, const CGEN_FIELDS *fields_)); void (*set_vma_operand) -- cgit v1.2.3