* elf32-hppa.h, elfcode.h: Replace uses of Elf*_Half, Elf*_Word,

	Elf*_Off typedefs by their expansion, the typedefs have been
	removed from include/elf/internal.h.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 42a8195af8b4b9a785c838a91b8f5a9af7c35d31..fcfe8bae1df7a9abe69d37d47a2d2f313b58d34b 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+Sat Mar  5 14:08:54 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+       * elf32-hppa.h, elfcode.h:  Replace uses of Elf*_Half, Elf*_Word,
+       Elf*_Off typedefs by their expansion, the typedefs have been
+       removed from include/elf/internal.h.
+
 Thu Mar  3 20:03:39 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
 
        * som.h (_PA_RISC_ID): Treat HOST_HPPAOSF just like HOST_HPPABSD.

diff --git a/bfd/elf32-hppa.h b/bfd/elf32-hppa.h
index af264c050bafe4bb980c9df3f6bf536cb8127e77..dadc411674c18dc6a5504804572ac5c2fa9e1ff8 100644 (file)
--- a/bfd/elf32-hppa.h
+++ b/bfd/elf32-hppa.h
@@ -334,7 +334,7 @@ enum elf32_hppa_symextn_types
 /* FIXME.  Are these external?  (For example used by GAS?).  If so the
    names need to change to avoid namespace pollution, if not they should
    be moved into elf32-hppa.c.  */
-typedef Elf32_Word symext_entryS;
+typedef unsigned long symext_entryS;
 struct symext_chain
   {
     symext_entryS entry;

diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index cb4f451c50d31f76b03f84a1310504f1583b7fa8..c3ff9ff2cfb453eab2d94f2804cf0ddb318d9ef4 100644 (file)
--- a/bfd/elfcode.h
+++ b/bfd/elfcode.h
@@ -466,6 +466,7 @@ DEFUN (bfd_section_from_shdr, (abfd, shindex),
       return true;
 
     case SHT_PROGBITS:
+    case SHT_DYNAMIC:
       /* Bits that get saved. This one is real. */
       if (!hdr->rawdata)
        {
@@ -662,7 +663,6 @@ DEFUN (bfd_section_from_shdr, (abfd, shindex),
       break;
 
     case SHT_HASH:
-    case SHT_DYNAMIC:
     case SHT_DYNSYM:           /* could treat this like symtab... */
 #if 0
       fprintf (stderr, "Dynamic Linking sections not yet supported.\n");
@@ -1523,7 +1523,7 @@ DEFUN (elf_write_phdrs, (abfd, i_ehdrp, i_phdrp, phdr_cnt),
        bfd * abfd AND
        Elf_Internal_Ehdr * i_ehdrp AND
        Elf_Internal_Phdr * i_phdrp AND
-       Elf32_Half phdr_cnt)
+       unsigned short phdr_cnt)
 {
   /* first program header entry goes after the file header */
   int outbase = i_ehdrp->e_phoff;
@@ -2898,8 +2898,8 @@ DEFUN (elf_slurp_reloc_table, (abfd, asect, symbols),
   arelent *reloc_cache;
   arelent *cache_ptr;
   Elf_Internal_Shdr *data_hdr;
-  ElfNAME (Off) data_off;
-  ElfNAME (Word) data_max;
+  bfd_vma data_off;
+  unsigned long data_max;
   char buf[4];                 /* FIXME -- might be elf64 */
 
   unsigned int idx;