about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGeoff Keating <geoffk@cygnus.com>2000-10-19 08:15:09 +0000
committerGeoff Keating <geoffk@cygnus.com>2000-10-19 08:15:09 +0000
commitc6e6c9c89638686b38e31aea84be89af8a4a5c3b (patch)
treeee47187b4d5f3800ab1103d257b38c69ad936612
parent549fc33c06adc87952a2a7fbd975d067a52d7190 (diff)
downloadglibc-c6e6c9c89638686b38e31aea84be89af8a4a5c3b.tar.gz
glibc-c6e6c9c89638686b38e31aea84be89af8a4a5c3b.tar.xz
glibc-c6e6c9c89638686b38e31aea84be89af8a4a5c3b.zip
* sysdeps/powerpc/dl-machine.c (dl_reloc_overflow): New function.
(__process_machine_rela): Print the address of an overflowing 
reloc.
2000-10-17  Geoffrey Keating  <geoffk@cygnus.com>

	* sysdeps/powerpc/fpu/bits/mathinline.h: Add versions
	of the unordered comparison functions that use the GCC builtins.

	* sysdeps/powerpc/dl-machine.c (dl_reloc_overflow): New function.
	(__process_machine_rela): Print the address of an overflowing
	reloc.
-rw-r--r--ChangeLog9
-rw-r--r--sysdeps/powerpc/dl-machine.c27
2 files changed, 28 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 175bcd23aa..09bae078d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-10-17  Geoffrey Keating  <geoffk@cygnus.com>
+
+	* sysdeps/powerpc/fpu/bits/mathinline.h: Add versions
+	of the unordered comparison functions that use the GCC builtins.
+
+	* sysdeps/powerpc/dl-machine.c (dl_reloc_overflow): New function.
+	(__process_machine_rela): Print the address of an overflowing
+	reloc.
+
 2000-10-18  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/shm_open.c: Correct default mount point
diff --git a/sysdeps/powerpc/dl-machine.c b/sysdeps/powerpc/dl-machine.c
index 3fac11fbd1..ca0a0dcd16 100644
--- a/sysdeps/powerpc/dl-machine.c
+++ b/sysdeps/powerpc/dl-machine.c
@@ -25,6 +25,7 @@
 #include <ldsodefs.h>
 #include <elf/dynamic-link.h>
 #include <dl-machine.h>
+#include <stdio-common/_itoa.h>
 
 /* Because ld.so is now versioned, these functions can be in their own file;
    no relocations need to be done to call them.
@@ -364,6 +365,20 @@ __elf_machine_fixup_plt(struct link_map *map, const Elf32_Rela *reloc,
   return finaladdr;
 }
 
+static void
+dl_reloc_overflow (struct link_map *map,
+		   const char *name,
+		   Elf32_Addr *const reloc_addr)
+{
+  char buffer[128];
+  char *t;
+  t = stpcpy (buffer, name);
+  t = stpcpy (t, " relocation at 0x00000000");
+  _itoa_word ((unsigned) reloc_addr, t, 16, 0);
+  t = stpcpy (t, " out of range");
+  _dl_signal_error (0, map->l_name, buffer);
+}
+
 void
 __process_machine_rela (struct link_map *map,
 			const Elf32_Rela *reloc,
@@ -387,16 +402,14 @@ __process_machine_rela (struct link_map *map,
 
     case R_PPC_ADDR24:
       if (finaladdr > 0x01fffffc && finaladdr < 0xfe000000)
-	_dl_signal_error (0, map->l_name,
-			  "R_PPC_ADDR24 relocation out of range");
+	dl_reloc_overflow (map,  "R_PPC_ADDR24", reloc_addr);
       *reloc_addr = (*reloc_addr & 0xfc000003) | (finaladdr & 0x3fffffc);
       break;
 
     case R_PPC_ADDR16:
     case R_PPC_UADDR16:
       if (finaladdr > 0x7fff && finaladdr < 0x8000)
-	_dl_signal_error (0, map->l_name,
-			  "R_PPC_ADDR16 relocation out of range");
+	dl_reloc_overflow (map,  "R_PPC_ADDR16", reloc_addr);
       *(Elf32_Half*) reloc_addr = finaladdr;
       break;
 
@@ -416,8 +429,7 @@ __process_machine_rela (struct link_map *map,
     case R_PPC_ADDR14_BRTAKEN:
     case R_PPC_ADDR14_BRNTAKEN:
       if (finaladdr > 0x7fff && finaladdr < 0x8000)
-	_dl_signal_error (0, map->l_name,
-			  "R_PPC_ADDR14 relocation out of range");
+	dl_reloc_overflow (map,  "R_PPC_ADDR14", reloc_addr);
       *reloc_addr = (*reloc_addr & 0xffff0003) | (finaladdr & 0xfffc);
       if (rinfo != R_PPC_ADDR14)
 	*reloc_addr = ((*reloc_addr & 0xffdfffff)
@@ -429,8 +441,7 @@ __process_machine_rela (struct link_map *map,
       {
 	Elf32_Sword delta = finaladdr - (Elf32_Word) reloc_addr;
 	if (delta << 6 >> 6 != delta)
-	  _dl_signal_error (0, map->l_name,
-			    "R_PPC_REL24 relocation out of range");
+	  dl_reloc_overflow (map,  "R_PPC_REL14", reloc_addr);
 	*reloc_addr = (*reloc_addr & 0xfc000003) | (delta & 0x3fffffc);
       }
       break;