summaryrefslogtreecommitdiff
path: root/usr/src/uts/sparc/krtld
diff options
context:
space:
mode:
authorrie <none@none>2006-01-25 14:52:02 -0800
committerrie <none@none>2006-01-25 14:52:02 -0800
commit141040e8a310da49386b596573e5dde5580572ec (patch)
treeb5527b2c362269cb56233f5267494f647d984d6e /usr/src/uts/sparc/krtld
parentff5b2339ca8296ceb5d62fbaa95bad42f885c26d (diff)
downloadillumos-joyent-141040e8a310da49386b596573e5dde5580572ec.tar.gz
6372082 ld -r erroneously creates .got section on i386
6201866 amd64: linker symbol elimination is broken
Diffstat (limited to 'usr/src/uts/sparc/krtld')
-rw-r--r--usr/src/uts/sparc/krtld/doreloc.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/usr/src/uts/sparc/krtld/doreloc.c b/usr/src/uts/sparc/krtld/doreloc.c
index 083d0dcbf4..446f9a82bc 100644
--- a/usr/src/uts/sparc/krtld/doreloc.c
+++ b/usr/src/uts/sparc/krtld/doreloc.c
@@ -21,7 +21,7 @@
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -72,11 +72,10 @@ const Rel_entry reloc_table[R_SPARC_NUM] = {
/* R_SPARC_GOT13 */ {0x0, FLG_RE_GOTADD | FLG_RE_VERIFY | FLG_RE_SIGN,
4, 0, 13},
/* R_SPARC_GOT22 */ {0x0, FLG_RE_GOTADD, 4, 10, 22},
-/* R_SPARC_PC10 */ {0x3ff, FLG_RE_PCREL | FLG_RE_GOTPC | FLG_RE_SIGN |
- FLG_RE_LOCLBND, 4, 0, 13},
-/* R_SPARC_PC22 */ {0x0, FLG_RE_PCREL | FLG_RE_GOTPC | FLG_RE_SIGN |
- FLG_RE_VERIFY | FLG_RE_LOCLBND,
- 4, 10, 22},
+/* R_SPARC_PC10 */ {0x3ff, FLG_RE_PCREL | FLG_RE_SIGN | FLG_RE_LOCLBND,
+ 4, 0, 13},
+/* R_SPARC_PC22 */ {0x0, FLG_RE_PCREL | FLG_RE_SIGN | FLG_RE_VERIFY |
+ FLG_RE_LOCLBND, 4, 10, 22},
/* R_SPARC_WPLT30 */ {0x0, FLG_RE_PCREL | FLG_RE_PLTREL |
FLG_RE_VERIFY | FLG_RE_SIGN,
4, 2, 30},
@@ -111,11 +110,11 @@ const Rel_entry reloc_table[R_SPARC_NUM] = {
/* R_SPARC_HH22 */ {0x0, FLG_RE_VERIFY, 4, 42, 22}, /* V9 */
/* R_SPARC_HM10 */ {0x3ff, FLG_RE_SIGN, 4, 32, 13}, /* V9 */
/* R_SPARC_LM22 */ {0x0, FLG_RE_NOTREL, 4, 10, 22}, /* V9 */
-/* R_SPARC_PC_HH22 */ {0x0, FLG_RE_PCREL | FLG_RE_VERIFY | FLG_RE_GOTPC,
+/* R_SPARC_PC_HH22 */ {0x0, FLG_RE_PCREL | FLG_RE_VERIFY,
4, 42, 22}, /* V9 */
-/* R_SPARC_PC_HM10 */ {0x3ff, FLG_RE_PCREL | FLG_RE_SIGN | FLG_RE_GOTPC,
+/* R_SPARC_PC_HM10 */ {0x3ff, FLG_RE_PCREL | FLG_RE_SIGN,
4, 32, 13}, /* V9 */
-/* R_SPARC_PC_LM22 */ {0x0, FLG_RE_PCREL | FLG_RE_GOTPC,
+/* R_SPARC_PC_LM22 */ {0x0, FLG_RE_PCREL,
4, 10, 22}, /* V9 */
/* R_SPARC_WDISP16 */ {0x0, FLG_RE_PCREL | FLG_RE_WDISP16 |
FLG_RE_VERIFY | FLG_RE_SIGN,