about summary refs log tree commit diff
path: root/sysdeps/mips
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1999-07-21 16:58:06 +0000
committerRoland McGrath <roland@gnu.org>1999-07-21 16:58:06 +0000
commit421c80d27e2dda29efd8e53dd18090b22546867c (patch)
tree978d5ff557f7e1178ee7e21591460cfe12a9e337 /sysdeps/mips
parente26996aa991c92637310c12f37e266ad3931b289 (diff)
downloadglibc-421c80d27e2dda29efd8e53dd18090b22546867c.tar.gz
glibc-421c80d27e2dda29efd8e53dd18090b22546867c.tar.xz
glibc-421c80d27e2dda29efd8e53dd18090b22546867c.zip
1999-07-21 Roland McGrath <roland@baalperazim.frob.com>
	* elf/dl-reloc.c (_dl_reloc_bad_type): New function.
	* elf/ldsodefs.h: Declare it.
	* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Use it
	instead of assert.
	(elf_machine_lazy_rel): Likewise.  Take new arg MAP.
	* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Likewise.
	(elf_machine_lazy_rel): Likewise.
	* sysdeps/mips/dl-machine.h (elf_machine_rel): Likewise.
	(elf_machine_lazy_rel): Likewise.
	* sysdeps/mips/mips64/dl-machine.h (elf_machine_rel): Likewise.
	(elf_machine_lazy_rel): Likewise.
	* sysdeps/m68k/dl-machine.h (elf_machine_rela): Likewise.
	(elf_machine_lazy_rel): Likewise.
	* sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise.
	(elf_machine_lazy_rel): Likewise.
	* sysdeps/generic/dl-machine.h (elf_machine_rel): Likewise.
	* sysdeps/arm/dl-machine.h (elf_machine_rel): Likewise.
	(elf_machine_lazy_rel): Likewise.
	* sysdeps/alpha/dl-machine.h (elf_machine_rela): Likewise.
	(elf_machine_lazy_rel): Likewise.
	* sysdeps/powerpc/dl-machine.h (elf_machine_lazy_rel): Likewise.
	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Use
	_dl_reloc_bad_type instead of _dl_signal_error.
	* elf/do-rel.h (elf_dynamic_do_rel): Pass MAP to elf_machine_lazy_rel.
Diffstat (limited to 'sysdeps/mips')
-rw-r--r--sysdeps/mips/dl-machine.h6
-rw-r--r--sysdeps/mips/mips64/dl-machine.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h
index 6896e53546..5811b78b29 100644
--- a/sysdeps/mips/dl-machine.h
+++ b/sysdeps/mips/dl-machine.h
@@ -25,7 +25,6 @@
 
 #define ELF_MACHINE_NO_PLT
 
-#include <assert.h>
 #include <entry.h>
 
 #ifndef ENTRY_POINT
@@ -567,13 +566,14 @@ elf_machine_rel (struct link_map *map, const ElfW(Rel) *reloc,
     case R_MIPS_NONE:		/* Alright, Wilbur.  */
       break;
     default:
-      assert (! "unexpected dynamic reloc type");
+      _dl_reloc_bad_type (map, ELFW(R_TYPE) (reloc->r_info), 0);
       break;
     }
 }
 
 static inline void
-elf_machine_lazy_rel (ElfW(Addr) l_addr, const ElfW(Rel) *reloc)
+elf_machine_lazy_rel (struct link_map *map,
+		      ElfW(Addr) l_addr, const ElfW(Rel) *reloc)
 {
   /* Do nothing.  */
 }
diff --git a/sysdeps/mips/mips64/dl-machine.h b/sysdeps/mips/mips64/dl-machine.h
index e2b62b8199..f200fcda64 100644
--- a/sysdeps/mips/mips64/dl-machine.h
+++ b/sysdeps/mips/mips64/dl-machine.h
@@ -25,7 +25,6 @@
 
 #define ELF_MACHINE_NO_PLT
 
-#include <assert.h>
 #include <entry.h>
 
 #ifndef ENTRY_POINT
@@ -562,13 +561,14 @@ elf_machine_rel (struct link_map *map, const ElfW(Rel) *reloc,
     case R_MIPS_NONE:		/* Alright, Wilbur.  */
       break;
     default:
-      assert (! "unexpected dynamic reloc type");
+      _dl_reloc_bad_type (map, ELFW(R_TYPE) (reloc->r_info), 0);
       break;
     }
 }
 
 static inline void
-elf_machine_lazy_rel (struct link_map *map, const ElfW(Rel) *reloc)
+elf_machine_lazy_rel (struct link_map *map, ElfW(Addr) l_addr,
+		      const ElfW(Rel) *reloc)
 {
   /* Do nothing.  */
 }