summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Henderson <rth@kanga.twiddle.net>2003-06-08 02:41:06 -0700
committerRichard Henderson <rth@kanga.twiddle.net>2003-06-08 02:41:06 -0700
commitde4ab2e314f99358f488baf70027554db66d0b1e (patch)
treec920ec764e51b8e22e00ffeee00fbe9d32605921
parentc1bbdcff746326e14c5b4c061e3234811915d18b (diff)
[ALPHA] Fix missed __ex_table to conversion to pc-relative relocs.
-rw-r--r--arch/alpha/kernel/traps.c80
-rw-r--r--arch/alpha/lib/csum_partial_copy.c4
2 files changed, 42 insertions, 42 deletions
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c
index 4cfbd4e27786..ddea651cb87e 100644
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
@@ -485,9 +485,9 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg,
" extwh %2,%3,%2\n"
"3:\n"
".section __ex_table,\"a\"\n"
- " .gprel32 1b\n"
+ " .long 1b - .\n"
" lda %1,3b-1b(%0)\n"
- " .gprel32 2b\n"
+ " .long 2b - .\n"
" lda %2,3b-2b(%0)\n"
".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2)
@@ -505,9 +505,9 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg,
" extlh %2,%3,%2\n"
"3:\n"
".section __ex_table,\"a\"\n"
- " .gprel32 1b\n"
+ " .long 1b - .\n"
" lda %1,3b-1b(%0)\n"
- " .gprel32 2b\n"
+ " .long 2b - .\n"
" lda %2,3b-2b(%0)\n"
".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2)
@@ -525,9 +525,9 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg,
" extqh %2,%3,%2\n"
"3:\n"
".section __ex_table,\"a\"\n"
- " .gprel32 1b\n"
+ " .long 1b - .\n"
" lda %1,3b-1b(%0)\n"
- " .gprel32 2b\n"
+ " .long 2b - .\n"
" lda %2,3b-2b(%0)\n"
".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2)
@@ -554,13 +554,13 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg,
"4: stq_u %1,0(%5)\n"
"5:\n"
".section __ex_table,\"a\"\n"
- " .gprel32 1b\n"
+ " .long 1b - .\n"
" lda %2,5b-1b(%0)\n"
- " .gprel32 2b\n"
+ " .long 2b - .\n"
" lda %1,5b-2b(%0)\n"
- " .gprel32 3b\n"
+ " .long 3b - .\n"
" lda $31,5b-3b(%0)\n"
- " .gprel32 4b\n"
+ " .long 4b - .\n"
" lda $31,5b-4b(%0)\n"
".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2),
@@ -584,13 +584,13 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg,
"4: stq_u %1,0(%5)\n"
"5:\n"
".section __ex_table,\"a\"\n"
- " .gprel32 1b\n"
+ " .long 1b - .\n"
" lda %2,5b-1b(%0)\n"
- " .gprel32 2b\n"
+ " .long 2b - .\n"
" lda %1,5b-2b(%0)\n"
- " .gprel32 3b\n"
+ " .long 3b - .\n"
" lda $31,5b-3b(%0)\n"
- " .gprel32 4b\n"
+ " .long 4b - .\n"
" lda $31,5b-4b(%0)\n"
".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2),
@@ -614,13 +614,13 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg,
"4: stq_u %1,0(%5)\n"
"5:\n"
".section __ex_table,\"a\"\n\t"
- " .gprel32 1b\n"
+ " .long 1b - .\n"
" lda %2,5b-1b(%0)\n"
- " .gprel32 2b\n"
+ " .long 2b - .\n"
" lda %1,5b-2b(%0)\n"
- " .gprel32 3b\n"
+ " .long 3b - .\n"
" lda $31,5b-3b(%0)\n"
- " .gprel32 4b\n"
+ " .long 4b - .\n"
" lda $31,5b-4b(%0)\n"
".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2),
@@ -845,9 +845,9 @@ do_entUnaUser(void * va, unsigned long opcode,
" extwh %2,%3,%2\n"
"3:\n"
".section __ex_table,\"a\"\n"
- " .gprel32 1b\n"
+ " .long 1b - .\n"
" lda %1,3b-1b(%0)\n"
- " .gprel32 2b\n"
+ " .long 2b - .\n"
" lda %2,3b-2b(%0)\n"
".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2)
@@ -865,9 +865,9 @@ do_entUnaUser(void * va, unsigned long opcode,
" extlh %2,%3,%2\n"
"3:\n"
".section __ex_table,\"a\"\n"
- " .gprel32 1b\n"
+ " .long 1b - .\n"
" lda %1,3b-1b(%0)\n"
- " .gprel32 2b\n"
+ " .long 2b - .\n"
" lda %2,3b-2b(%0)\n"
".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2)
@@ -885,9 +885,9 @@ do_entUnaUser(void * va, unsigned long opcode,
" extqh %2,%3,%2\n"
"3:\n"
".section __ex_table,\"a\"\n"
- " .gprel32 1b\n"
+ " .long 1b - .\n"
" lda %1,3b-1b(%0)\n"
- " .gprel32 2b\n"
+ " .long 2b - .\n"
" lda %2,3b-2b(%0)\n"
".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2)
@@ -905,9 +905,9 @@ do_entUnaUser(void * va, unsigned long opcode,
" extlh %2,%3,%2\n"
"3:\n"
".section __ex_table,\"a\"\n"
- " .gprel32 1b\n"
+ " .long 1b - .\n"
" lda %1,3b-1b(%0)\n"
- " .gprel32 2b\n"
+ " .long 2b - .\n"
" lda %2,3b-2b(%0)\n"
".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2)
@@ -925,9 +925,9 @@ do_entUnaUser(void * va, unsigned long opcode,
" extqh %2,%3,%2\n"
"3:\n"
".section __ex_table,\"a\"\n"
- " .gprel32 1b\n"
+ " .long 1b - .\n"
" lda %1,3b-1b(%0)\n"
- " .gprel32 2b\n"
+ " .long 2b - .\n"
" lda %2,3b-2b(%0)\n"
".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2)
@@ -954,13 +954,13 @@ do_entUnaUser(void * va, unsigned long opcode,
"4: stq_u %1,0(%5)\n"
"5:\n"
".section __ex_table,\"a\"\n"
- " .gprel32 1b\n"
+ " .long 1b - .\n"
" lda %2,5b-1b(%0)\n"
- " .gprel32 2b\n"
+ " .long 2b - .\n"
" lda %1,5b-2b(%0)\n"
- " .gprel32 3b\n"
+ " .long 3b - .\n"
" lda $31,5b-3b(%0)\n"
- " .gprel32 4b\n"
+ " .long 4b - .\n"
" lda $31,5b-4b(%0)\n"
".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2),
@@ -988,13 +988,13 @@ do_entUnaUser(void * va, unsigned long opcode,
"4: stq_u %1,0(%5)\n"
"5:\n"
".section __ex_table,\"a\"\n"
- " .gprel32 1b\n"
+ " .long 1b - .\n"
" lda %2,5b-1b(%0)\n"
- " .gprel32 2b\n"
+ " .long 2b - .\n"
" lda %1,5b-2b(%0)\n"
- " .gprel32 3b\n"
+ " .long 3b - .\n"
" lda $31,5b-3b(%0)\n"
- " .gprel32 4b\n"
+ " .long 4b - .\n"
" lda $31,5b-4b(%0)\n"
".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2),
@@ -1022,13 +1022,13 @@ do_entUnaUser(void * va, unsigned long opcode,
"4: stq_u %1,0(%5)\n"
"5:\n"
".section __ex_table,\"a\"\n\t"
- " .gprel32 1b\n"
+ " .long 1b - .\n"
" lda %2,5b-1b(%0)\n"
- " .gprel32 2b\n"
+ " .long 2b - .\n"
" lda %1,5b-2b(%0)\n"
- " .gprel32 3b\n"
+ " .long 3b - .\n"
" lda $31,5b-3b(%0)\n"
- " .gprel32 4b\n"
+ " .long 4b - .\n"
" lda $31,5b-4b(%0)\n"
".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2),
diff --git a/arch/alpha/lib/csum_partial_copy.c b/arch/alpha/lib/csum_partial_copy.c
index a24a4e1abdbc..702efb639d3e 100644
--- a/arch/alpha/lib/csum_partial_copy.c
+++ b/arch/alpha/lib/csum_partial_copy.c
@@ -46,7 +46,7 @@ __asm__ __volatile__("insqh %1,%2,%0":"=r" (z):"r" (x),"r" (y))
"1: ldq_u %0,%2\n" \
"2:\n" \
".section __ex_table,\"a\"\n" \
- " .gprel32 1b\n" \
+ " .long 1b - .\n" \
" lda %0,2b-1b(%1)\n" \
".previous" \
: "=r"(x), "=r"(__guu_err) \
@@ -61,7 +61,7 @@ __asm__ __volatile__("insqh %1,%2,%0":"=r" (z):"r" (x),"r" (y))
"1: stq_u %2,%1\n" \
"2:\n" \
".section __ex_table,\"a\"\n" \
- " .gprel32 1b" \
+ " .long 1b - ." \
" lda $31,2b-1b(%0)\n" \
".previous" \
: "=r"(__puu_err) \