aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@systemhalted.org>2009-11-15 15:11:48 -0500
committerCarlos O'Donell <carlos@systemhalted.org>2009-11-15 15:11:48 -0500
commit057c783bcab3331cddf1dde299b5ce4533d93e35 (patch)
treee33a4113b4eb6b314001a8ce13a0087314ddb9f4
parenta2ed3d2a8e01a7418dca1a7572effc10a33d67fe (diff)
downloadglibc-057c783bcab3331cddf1dde299b5ce4533d93e35.tar.xz
glibc-057c783bcab3331cddf1dde299b5ce4533d93e35.zip
Implement ELF_MACHINE_LOAD_ADDRESS using PC relative loads.
The current ELF_MACHINE_LOAD_ADDRESS used by the generic function pointer code was not safe for use before relocation. The macro has been rewritten to use only PC relative loads. 2009-11-15 Carlos O'Donell <carlos@codesourcery.com> * sysdeps/hppa/dl-fptr.h: Update copyright year. Reduce ELF_MACHINE_BOOT_FPTR_TABLE_LEN to 64. Implement ELF_MACHINE_LOAD_ADDRESS using PC relative loads.
-rw-r--r--ChangeLog.hppa6
-rw-r--r--sysdeps/hppa/dl-fptr.h20
2 files changed, 17 insertions, 9 deletions
diff --git a/ChangeLog.hppa b/ChangeLog.hppa
index 4d61147a3c..342bf5e837 100644
--- a/ChangeLog.hppa
+++ b/ChangeLog.hppa
@@ -1,5 +1,11 @@
2009-11-15 Carlos O'Donell <carlos@codesourcery.com>
+ * sysdeps/hppa/dl-fptr.h: Update copyright year.
+ Reduce ELF_MACHINE_BOOT_FPTR_TABLE_LEN to 64.
+ Implement ELF_MACHINE_LOAD_ADDRESS using PC relative loads.
+
+2009-11-15 Carlos O'Donell <carlos@codesourcery.com>
+
* sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h:
Remove FUTEX_WAITERS, FUTEX_OWNER_DIED, and FUTEX_TID_MASK.
diff --git a/sysdeps/hppa/dl-fptr.h b/sysdeps/hppa/dl-fptr.h
index 2ac9740e30..798ee8c969 100644
--- a/sysdeps/hppa/dl-fptr.h
+++ b/sysdeps/hppa/dl-fptr.h
@@ -1,5 +1,5 @@
/* Function descriptors. HPPA version.
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -22,14 +22,16 @@
#include <sysdeps/generic/dl-fptr.h>
-/* There are currently 20 dynamic symbols in ld.so.
+/* There are currently 33 dynamic symbols in ld.so.
ELF_MACHINE_BOOT_FPTR_TABLE_LEN needs to be at least that big. */
-#define ELF_MACHINE_BOOT_FPTR_TABLE_LEN 200
-
-#define ELF_MACHINE_LOAD_ADDRESS(var, symbol) \
- asm (" addil LT%%" #symbol ", %%r19\n" \
- " ldw RT%%" #symbol "(%%sr0,%%r1), %0\n" \
- : "=&r" (var));
-
+#define ELF_MACHINE_BOOT_FPTR_TABLE_LEN 64
+
+#define ELF_MACHINE_LOAD_ADDRESS(var, symbol) \
+ asm ( \
+" b,l 1f,%0\n" \
+" depi 0,31,2,%0\n" \
+"1: addil L'" #symbol " - ($PIC_pcrel$0 - 8),%0\n" \
+" ldo R'" #symbol " - ($PIC_pcrel$0 - 12)(%%r1),%0\n" \
+ : "=&r" (var) : : "r1");
#endif /* !dl_hppa_fptr_h */