2000-07-19 H.J. Lu <hjl@gnu.org>

[deliverable/binutils-gdb.git] / include / elf / sparc.h

diff --git a/include/elf/sparc.h b/include/elf/sparc.h
index c9e4cdd4040d72a274ec788affcefb919c61617f..f4a199e8994c900507ebc97a1aab192db05cd65b 100644 (file)
--- a/include/elf/sparc.h
+++ b/include/elf/sparc.h
@@ -1,5 +1,5 @@
 /* SPARC ELF support for BFD.
-   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1996, 97, 98, 99, 2000 Free Software Foundation, Inc.
    By Doug Evans, Cygnus Support, <dje@cygnus.com>.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define EF_SPARC_32PLUS                0x000100        /* generic V8+ features */
 #define EF_SPARC_SUN_US1       0x000200        /* Sun UltraSPARC1 extensions */
 #define EF_SPARC_HAL_R1                0x000400        /* HAL R1 extensions */
+#define EF_SPARC_SUN_US3       0x000800        /* Sun UltraSPARCIII extensions */
 
 #define EF_SPARC_LEDATA         0x800000       /* little endian data */
 
@@ -128,29 +129,24 @@ START_RELOC_NUMBERS (elf_sparc_reloc_type)
   /* little endian data relocs */
   RELOC_NUMBER (R_SPARC_REV32, 56)
 
+  EMPTY_RELOC  (R_SPARC_max_std)
+
   RELOC_NUMBER (R_SPARC_GNU_VTINHERIT, 250)
   RELOC_NUMBER (R_SPARC_GNU_VTENTRY, 251)
 
-  EMPTY_RELOC  (R_SPARC_max)
-END_RELOC_NUMBERS
+END_RELOC_NUMBERS (R_SPARC_max)
 
 /* Relocation macros.  */
 
-#define ELF64_R_TYPE_DATA(info)                (((bfd_vma) (info) << 32) >> 40)
-#define ELF64_R_TYPE_ID(info)          (((bfd_vma) (info) << 56) >> 56)
-#define ELF64_R_TYPE_INFO(data, type)  (((bfd_vma) (data) << 8) \
-                                        + (bfd_vma) (type))
-
-#define DT_SPARC_REGISTER      0x70000001
+#define ELF64_R_TYPE_DATA(info) \
+  (((bfd_signed_vma)(ELF64_R_TYPE(info) >> 8) ^ 0x800000) - 0x800000)
+#define ELF64_R_TYPE_ID(info) \
+  ((info) & 0xff)
+#define ELF64_R_TYPE_INFO(data, type) \
+  (((bfd_vma) ((data) & 0xffffff) << 8) | (bfd_vma) (type))
 
-/*
- * FIXME: NOT ABI -- GET RID OF THIS
- * Defines the format used by the .plt.  Currently defined values are
- *   0 -- reserved to SI
- *   1 -- absolute address in .got.plt
- *   2 -- got-relative address in .got.plt
- */
+/* Values for Elf64_Dyn.d_tag.  */
 
-#define DT_SPARC_PLTFMT                0x70000001
+#define DT_SPARC_REGISTER      0x70000001
 
 #endif /* _ELF_SPARC_H */