diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/bfdlink.h | 4 | ||||
| -rw-r--r-- | include/elf/ChangeLog | 5 | ||||
| -rw-r--r-- | include/elf/sparc.h | 30 | ||||
| -rw-r--r-- | include/opcode/ChangeLog | 7 | ||||
| -rw-r--r-- | include/opcode/sparc.h | 37 |
6 files changed, 10 insertions, 78 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 1a4680ed2..53984e1c0 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,8 +1,3 @@ -2011-09-15 H.J. Lu <hongjiu.lu@intel.com> - - PR ld/12975 - * bfdlink.h (bfd_link_info): Add version_info. - 2011-07-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * xregex.h (regoff_t): Define. diff --git a/include/bfdlink.h b/include/bfdlink.h index c9e127c5c..71b1e253c 100644 --- a/include/bfdlink.h +++ b/include/bfdlink.h @@ -245,7 +245,6 @@ struct flag_info }; struct bfd_elf_dynamic_list; -struct bfd_elf_version_tree; /* This structure holds all the information needed to communicate between BFD and the linker when doing a link. */ @@ -497,9 +496,6 @@ struct bfd_link_info /* List of symbols should be dynamic. */ struct bfd_elf_dynamic_list *dynamic_list; - - /* The version information. */ - struct bfd_elf_version_tree *version_info; }; /* This structures holds a set of callback functions. These are called diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog index e04b26d5d..02eb787ca 100644 --- a/include/elf/ChangeLog +++ b/include/elf/ChangeLog @@ -1,8 +1,3 @@ -2011-09-21 David S. Miller <davem@davemloft.net> - - * sparc.h (Tag_GNU_Sparc_HWCAPS): New object attribute. - (ELF_SPARC_HWCAP_*): New HWCAPS bitmask values. - 2011-08-12 H.J. Lu <hongjiu.lu@intel.com> PR ld/13082 diff --git a/include/elf/sparc.h b/include/elf/sparc.h index fc8a765a6..424715134 100644 --- a/include/elf/sparc.h +++ b/include/elf/sparc.h @@ -1,6 +1,5 @@ /* SPARC ELF support for BFD. - Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2008, 2010, - 2011 + Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2008, 2010 Free Software Foundation, Inc. By Doug Evans, Cygnus Support, <dje@cygnus.com>. @@ -186,31 +185,4 @@ END_RELOC_NUMBERS (R_SPARC_max) #define DT_SPARC_REGISTER 0x70000001 -/* Object attribute tags. */ -enum -{ - /* 0-3 are generic. */ - Tag_GNU_Sparc_HWCAPS = 4, -}; - -/* These values match the AV_SPARC_* hwcap bits defined under Solaris. */ -#define ELF_SPARC_HWCAP_MUL32 0x00000001 /* umul/umulcc/smul/smulcc insns */ -#define ELF_SPARC_HWCAP_DIV32 0x00000002 /* udiv/udivcc/sdiv/sdivcc insns */ -#define ELF_SPARC_HWCAP_FSMULD 0x00000004 /* 'fsmuld' insn */ -#define ELF_SPARC_HWCAP_V8PLUS 0x00000008 /* v9 insns available to 32bit */ -#define ELF_SPARC_HWCAP_POPC 0x00000010 /* 'popc' insn */ -#define ELF_SPARC_HWCAP_VIS 0x00000020 /* VIS insns */ -#define ELF_SPARC_HWCAP_VIS2 0x00000040 /* VIS2 insns */ -#define ELF_SPARC_HWCAP_ASI_BLK_INIT \ - 0x00000080 /* block init ASIs */ -#define ELF_SPARC_HWCAP_FMAF 0x00000100 /* fused multiply-add */ -#define ELF_SPARC_HWCAP_VIS3 0x00000400 /* VIS3 insns */ -#define ELF_SPARC_HWCAP_HPC 0x00000800 /* HPC insns */ -#define ELF_SPARC_HWCAP_RANDOM 0x00001000 /* 'random' insn */ -#define ELF_SPARC_HWCAP_TRANS 0x00002000 /* transaction insns */ -#define ELF_SPARC_HWCAP_FJFMAU 0x00004000 /* unfused multiply-add */ -#define ELF_SPARC_HWCAP_IMA 0x00008000 /* integer multiply-add */ -#define ELF_SPARC_HWCAP_ASI_CACHE_SPARING \ - 0x00010000 /* cache sparing ASIs */ - #endif /* _ELF_SPARC_H */ diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog index 8f070a10d..a69f7461d 100644 --- a/include/opcode/ChangeLog +++ b/include/opcode/ChangeLog @@ -1,10 +1,3 @@ -2011-09-21 David S. Miller <davem@davemloft.net> - - * sparc.h (struct sparc_opcode): Expand 'flags' to unsigned int. - (F_MUL32, F_DIV32, F_FSMULD, F_V8PLUS, F_POPC, F_VIS, F_VIS2, - F_ASI_BLK_INIT, F_FMAF, F_VIS3, F_HPC, F_RANDOM, F_TRANS, - F_FJFMAU, F_IMA, F_ASI_CACHE_SPARING): New flag bits. - 2011-08-09 Chao-ying Fu <fu@mips.com> Maciej W. Rozycki <macro@codesourcery.com> diff --git a/include/opcode/sparc.h b/include/opcode/sparc.h index 7ae3641cf..7203df756 100644 --- a/include/opcode/sparc.h +++ b/include/opcode/sparc.h @@ -1,6 +1,6 @@ /* Definitions for opcode table for the sparc. Copyright 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000, 2002, - 2003, 2005, 2010, 2011 Free Software Foundation, Inc. + 2003, 2005, 2010 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler, GDB, the GNU debugger, and the GNU Binutils. @@ -98,37 +98,18 @@ typedef struct sparc_opcode unsigned long lose; /* Bits that must not be set. */ const char *args; /* This was called "delayed" in versions before the flags. */ - unsigned int flags; + char flags; short architecture; /* Bitmask of sparc_opcode_arch_val's. */ } sparc_opcode; +#define F_DELAYED 1 /* Delayed branch. */ +#define F_ALIAS 2 /* Alias for a "real" instruction. */ +#define F_UNBR 4 /* Unconditional branch. */ +#define F_CONDBR 8 /* Conditional branch. */ +#define F_JSR 16 /* Subroutine call. */ +#define F_FLOAT 32 /* Floating point instruction (not a branch). */ +#define F_FBR 64 /* Floating point branch. */ /* FIXME: Add F_ANACHRONISTIC flag for v9. */ -#define F_DELAYED 0x00000001 /* Delayed branch. */ -#define F_ALIAS 0x00000002 /* Alias for a "real" instruction. */ -#define F_UNBR 0x00000004 /* Unconditional branch. */ -#define F_CONDBR 0x00000008 /* Conditional branch. */ -#define F_JSR 0x00000010 /* Subroutine call. */ -#define F_FLOAT 0x00000020 /* Floating point instruction (not a branch). */ -#define F_FBR 0x00000040 /* Floating point branch. */ -#define F_MUL32 0x00000100 /* umul/umulcc/smul/smulcc insns */ -#define F_DIV32 0x00000200 /* udiv/udivcc/sdiv/sdivcc insns */ -#define F_FSMULD 0x00000400 /* 'fsmuld' insn */ -#define F_V8PLUS 0x00000800 /* v9 insns available to 32bit */ -#define F_POPC 0x00001000 /* 'popc' insn */ -#define F_VIS 0x00002000 /* VIS insns */ -#define F_VIS2 0x00004000 /* VIS2 insns */ -#define F_ASI_BLK_INIT 0x00008000 /* block init ASIs */ -#define F_FMAF 0x00010000 /* fused multiply-add */ -#define F_VIS3 0x00020000 /* VIS3 insns */ -#define F_HPC 0x00040000 /* HPC insns */ -#define F_RANDOM 0x00080000 /* 'random' insn */ -#define F_TRANS 0x00100000 /* transaction insns */ -#define F_FJFMAU 0x00200000 /* unfused multiply-add */ -#define F_IMA 0x00400000 /* integer multiply-add */ -#define F_ASI_CACHE_SPARING \ - 0x00800000 /* cache sparing ASIs */ - -#define F_HWCAP_MASK 0x00ffff00 /* All sparc opcodes are 32 bits, except for the `set' instruction (really a macro), which is 64 bits. It is handled as a special case. |