This is the mail archive of the binutils@sources.redhat.com mailing list for the binutils project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
fix elf32-m68hc* gc_mark_hook

From: Alan Modra <amodra at bigpond dot net dot au>
To: binutils at sources dot redhat dot com
Date: Thu, 22 Aug 2002 15:13:13 +0930
Subject: fix elf32-m68hc* gc_mark_hook
Committed.

	* elf32-m68hc11.c: Formatting fixes.
	(elf32_m68hc11_gc_mark_hook): Correct params.  Remove unnecessary test.
	* elf32-m68hc12.c: Formatting fixes.
	(elf32_m68hc11_gc_mark_hook): Correct params.  Remove unnecessary test.

Index: bfd/elf32-m68hc11.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-m68hc11.c,v
retrieving revision 1.8
diff -u -p -r1.8 elf32-m68hc11.c
--- bfd/elf32-m68hc11.c	14 Aug 2002 08:14:30 -0000	1.8
+++ bfd/elf32-m68hc11.c	21 Aug 2002 01:43:46 -0000
@@ -27,44 +27,39 @@ Foundation, Inc., 59 Temple Place - Suit
 #include "elf/m68hc11.h"
 
 static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
-PARAMS ((bfd * abfd, bfd_reloc_code_real_type code));
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
 static void m68hc11_info_to_howto_rel
-PARAMS ((bfd *, arelent *, Elf32_Internal_Rel *));
+  PARAMS ((bfd *, arelent *, Elf32_Internal_Rel *));
 
 static bfd_reloc_status_type m68hc11_elf_ignore_reloc
-PARAMS ((bfd *abfd, arelent *reloc_entry,
-         asymbol *symbol, PTR data, asection *input_section,
-         bfd *output_bfd, char **error_message));
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 
 /* GC mark and sweep.  */
 static asection *elf32_m68hc11_gc_mark_hook
-PARAMS ((bfd *abfd, struct bfd_link_info *info,
-         Elf_Internal_Rela *rel, struct elf_link_hash_entry *h,
-         Elf_Internal_Sym *sym));
+  PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
+	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
 static boolean elf32_m68hc11_gc_sweep_hook
-PARAMS ((bfd *abfd, struct bfd_link_info *info,
-         asection *sec, const Elf_Internal_Rela *relocs));
+  PARAMS ((bfd *, struct bfd_link_info *, asection *,
+	   const Elf_Internal_Rela *));
 static boolean elf32_m68hc11_check_relocs
-PARAMS ((bfd * abfd, struct bfd_link_info * info,
-         asection * sec, const Elf_Internal_Rela * relocs));
+  PARAMS ((bfd *, struct bfd_link_info *, asection *,
+	   const Elf_Internal_Rela *));
 static boolean elf32_m68hc11_relocate_section
-PARAMS ((bfd *output_bfd, struct bfd_link_info *info,
-         bfd *input_bfd, asection *input_section,
-         bfd_byte *contents, Elf_Internal_Rela *relocs,
-         Elf_Internal_Sym *local_syms, asection **local_sections));
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
 static boolean m68hc11_elf_relax_section
   PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *));
 static void m68hc11_elf_relax_delete_bytes
-PARAMS ((bfd *abfd, asection *sec, bfd_vma addr, int count));
+  PARAMS ((bfd *, asection *, bfd_vma, int));
 static void m68hc11_relax_group
-PARAMS ((bfd *abfd, asection *sec, bfd_byte *contents,
-         unsigned value, unsigned long offset, unsigned long end_group));
-static int compare_reloc PARAMS ((const void*, const void*));
+  PARAMS ((bfd *, asection *, bfd_byte *, unsigned,
+	   unsigned long, unsigned long));
+static int compare_reloc PARAMS ((const void *, const void *));
 
 
-boolean _bfd_m68hc11_elf_merge_private_bfd_data PARAMS ((bfd*, bfd*));
-boolean _bfd_m68hc11_elf_set_private_flags PARAMS ((bfd*, flagword));
-boolean _bfd_m68hc11_elf_print_private_bfd_data PARAMS ((bfd*, PTR));
+boolean _bfd_m68hc11_elf_merge_private_bfd_data PARAMS ((bfd *, bfd *));
+boolean _bfd_m68hc11_elf_set_private_flags PARAMS ((bfd *, flagword));
+boolean _bfd_m68hc11_elf_print_private_bfd_data PARAMS ((bfd *, PTR));
 
 /* Use REL instead of RELA to save space */
 #define USE_REL
@@ -407,8 +402,8 @@ m68hc11_info_to_howto_rel (abfd, cache_p
 }
 
 static asection *
-elf32_m68hc11_gc_mark_hook (abfd, info, rel, h, sym)
-     bfd *abfd;
+elf32_m68hc11_gc_mark_hook (sec, info, rel, h, sym)
+     asection *sec;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
      Elf_Internal_Rela *rel;
      struct elf_link_hash_entry *h;
@@ -434,15 +429,8 @@ elf32_m68hc11_gc_mark_hook (abfd, info, 
 	}
     }
   else
-    {
-      if (!(elf_bad_symtab (abfd)
-	    && ELF_ST_BIND (sym->st_info) != STB_LOCAL)
-	  && !((sym->st_shndx <= 0 || sym->st_shndx >= SHN_LORESERVE)
-	       && sym->st_shndx != SHN_COMMON))
-	{
-	  return bfd_section_from_elf_index (abfd, sym->st_shndx);
-	}
-    }
+    return bfd_section_from_elf_index (sec->owner, sym->st_shndx);
+
   return NULL;
 }
 
Index: bfd/elf32-m68hc12.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-m68hc12.c,v
retrieving revision 1.7
diff -u -p -r1.7 elf32-m68hc12.c
--- bfd/elf32-m68hc12.c	19 Aug 2002 06:38:43 -0000	1.7
+++ bfd/elf32-m68hc12.c	21 Aug 2002 01:43:46 -0000
@@ -27,14 +27,12 @@ Foundation, Inc., 59 Temple Place - Suit
 #include "opcode/m68hc11.h"
 
 static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
-PARAMS ((bfd * abfd, bfd_reloc_code_real_type code));
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
 static void m68hc11_info_to_howto_rel
-PARAMS ((bfd *, arelent *, Elf32_Internal_Rel *));
+  PARAMS ((bfd *, arelent *, Elf32_Internal_Rel *));
 
 static bfd_reloc_status_type m68hc11_elf_ignore_reloc
-PARAMS ((bfd *abfd, arelent *reloc_entry,
-         asymbol *symbol, PTR data, asection *input_section,
-         bfd *output_bfd, char **error_message));
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static bfd_reloc_status_type m68hc12_elf_special_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static int m68hc12_addr_is_banked PARAMS ((bfd_vma));
@@ -43,16 +41,15 @@ static bfd_vma m68hc12_phys_page PARAMS 
 
 /* GC mark and sweep.  */
 static asection *elf32_m68hc11_gc_mark_hook
-PARAMS ((bfd *abfd, struct bfd_link_info *info,
-         Elf_Internal_Rela *rel, struct elf_link_hash_entry *h,
-         Elf_Internal_Sym *sym));
+  PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
+	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
 static boolean elf32_m68hc11_gc_sweep_hook
-PARAMS ((bfd *abfd, struct bfd_link_info *info,
-         asection *sec, const Elf_Internal_Rela *relocs));
+  PARAMS ((bfd *, struct bfd_link_info *, asection *,
+	   const Elf_Internal_Rela *));
 
-boolean _bfd_m68hc12_elf_merge_private_bfd_data PARAMS ((bfd*, bfd*));
-boolean _bfd_m68hc12_elf_set_private_flags PARAMS ((bfd*, flagword));
-boolean _bfd_m68hc12_elf_print_private_bfd_data PARAMS ((bfd*, PTR));
+boolean _bfd_m68hc12_elf_merge_private_bfd_data PARAMS ((bfd *, bfd *));
+boolean _bfd_m68hc12_elf_set_private_flags PARAMS ((bfd *, flagword));
+boolean _bfd_m68hc12_elf_print_private_bfd_data PARAMS ((bfd *, PTR));
 
 
 
@@ -592,8 +589,8 @@ m68hc11_info_to_howto_rel (abfd, cache_p
 }
 
 static asection *
-elf32_m68hc11_gc_mark_hook (abfd, info, rel, h, sym)
-     bfd *abfd;
+elf32_m68hc11_gc_mark_hook (sec, info, rel, h, sym)
+     asection *sec;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
      Elf_Internal_Rela *rel;
      struct elf_link_hash_entry *h;
@@ -619,15 +616,8 @@ elf32_m68hc11_gc_mark_hook (abfd, info, 
 	}
     }
   else
-    {
-      if (!(elf_bad_symtab (abfd)
-	    && ELF_ST_BIND (sym->st_info) != STB_LOCAL)
-	  && !((sym->st_shndx <= 0 || sym->st_shndx >= SHN_LORESERVE)
-	       && sym->st_shndx != SHN_COMMON))
-	{
-	  return bfd_section_from_elf_index (abfd, sym->st_shndx);
-	}
-    }
+    return bfd_section_from_elf_index (sec->owner, sym->st_shndx);
+
   return NULL;
 }
 

-- 
Alan Modra
IBM OzLabs - Linux Technology Centre
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]