Skip to content

L
linux
Commit de4ab2e3 authored by Richard Henderson's avatar Richard Henderson
Browse files
Options

[ALPHA] Fix missed __ex_table to conversion to pc-relative relocs.

parent c1bbdcff
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 42 deletions
arch/alpha/kernel/traps.c
View file @ de4ab2e3
...@@ -485,9 +485,9 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg, ...@@ -485,9 +485,9 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg,
" extwh %2,%3,%2\n" " extwh %2,%3,%2\n"
"3:\n" "3:\n"
".section __ex_table,\"a\"\n" ".section __ex_table,\"a\"\n"
" .gprel32 1b\n" " .long 1b - .\n"
" lda %1,3b-1b(%0)\n" " lda %1,3b-1b(%0)\n"
" .gprel32 2b\n" " .long 2b - .\n"
" lda %2,3b-2b(%0)\n" " lda %2,3b-2b(%0)\n"
".previous" ".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2) : "=r"(error), "=&r"(tmp1), "=&r"(tmp2)
...@@ -505,9 +505,9 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg, ...@@ -505,9 +505,9 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg,
" extlh %2,%3,%2\n" " extlh %2,%3,%2\n"
"3:\n" "3:\n"
".section __ex_table,\"a\"\n" ".section __ex_table,\"a\"\n"
" .gprel32 1b\n" " .long 1b - .\n"
" lda %1,3b-1b(%0)\n" " lda %1,3b-1b(%0)\n"
" .gprel32 2b\n" " .long 2b - .\n"
" lda %2,3b-2b(%0)\n" " lda %2,3b-2b(%0)\n"
".previous" ".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2) : "=r"(error), "=&r"(tmp1), "=&r"(tmp2)
...@@ -525,9 +525,9 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg, ...@@ -525,9 +525,9 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg,
" extqh %2,%3,%2\n" " extqh %2,%3,%2\n"
"3:\n" "3:\n"
".section __ex_table,\"a\"\n" ".section __ex_table,\"a\"\n"
" .gprel32 1b\n" " .long 1b - .\n"
" lda %1,3b-1b(%0)\n" " lda %1,3b-1b(%0)\n"
" .gprel32 2b\n" " .long 2b - .\n"
" lda %2,3b-2b(%0)\n" " lda %2,3b-2b(%0)\n"
".previous" ".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2) : "=r"(error), "=&r"(tmp1), "=&r"(tmp2)
...@@ -554,13 +554,13 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg, ...@@ -554,13 +554,13 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg,
"4: stq_u %1,0(%5)\n" "4: stq_u %1,0(%5)\n"
"5:\n" "5:\n"
".section __ex_table,\"a\"\n" ".section __ex_table,\"a\"\n"
" .gprel32 1b\n" " .long 1b - .\n"
" lda %2,5b-1b(%0)\n" " lda %2,5b-1b(%0)\n"
" .gprel32 2b\n" " .long 2b - .\n"
" lda %1,5b-2b(%0)\n" " lda %1,5b-2b(%0)\n"
" .gprel32 3b\n" " .long 3b - .\n"
" lda $31,5b-3b(%0)\n" " lda $31,5b-3b(%0)\n"
" .gprel32 4b\n" " .long 4b - .\n"
" lda $31,5b-4b(%0)\n" " lda $31,5b-4b(%0)\n"
".previous" ".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2), : "=r"(error), "=&r"(tmp1), "=&r"(tmp2),
...@@ -584,13 +584,13 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg, ...@@ -584,13 +584,13 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg,
"4: stq_u %1,0(%5)\n" "4: stq_u %1,0(%5)\n"
"5:\n" "5:\n"
".section __ex_table,\"a\"\n" ".section __ex_table,\"a\"\n"
" .gprel32 1b\n" " .long 1b - .\n"
" lda %2,5b-1b(%0)\n" " lda %2,5b-1b(%0)\n"
" .gprel32 2b\n" " .long 2b - .\n"
" lda %1,5b-2b(%0)\n" " lda %1,5b-2b(%0)\n"
" .gprel32 3b\n" " .long 3b - .\n"
" lda $31,5b-3b(%0)\n" " lda $31,5b-3b(%0)\n"
" .gprel32 4b\n" " .long 4b - .\n"
" lda $31,5b-4b(%0)\n" " lda $31,5b-4b(%0)\n"
".previous" ".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2), : "=r"(error), "=&r"(tmp1), "=&r"(tmp2),
...@@ -614,13 +614,13 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg, ...@@ -614,13 +614,13 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg,
"4: stq_u %1,0(%5)\n" "4: stq_u %1,0(%5)\n"
"5:\n" "5:\n"
".section __ex_table,\"a\"\n\t" ".section __ex_table,\"a\"\n\t"
" .gprel32 1b\n" " .long 1b - .\n"
" lda %2,5b-1b(%0)\n" " lda %2,5b-1b(%0)\n"
" .gprel32 2b\n" " .long 2b - .\n"
" lda %1,5b-2b(%0)\n" " lda %1,5b-2b(%0)\n"
" .gprel32 3b\n" " .long 3b - .\n"
" lda $31,5b-3b(%0)\n" " lda $31,5b-3b(%0)\n"
" .gprel32 4b\n" " .long 4b - .\n"
" lda $31,5b-4b(%0)\n" " lda $31,5b-4b(%0)\n"
".previous" ".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2), : "=r"(error), "=&r"(tmp1), "=&r"(tmp2),
...@@ -845,9 +845,9 @@ do_entUnaUser(void * va, unsigned long opcode, ...@@ -845,9 +845,9 @@ do_entUnaUser(void * va, unsigned long opcode,
" extwh %2,%3,%2\n" " extwh %2,%3,%2\n"
"3:\n" "3:\n"
".section __ex_table,\"a\"\n" ".section __ex_table,\"a\"\n"
" .gprel32 1b\n" " .long 1b - .\n"
" lda %1,3b-1b(%0)\n" " lda %1,3b-1b(%0)\n"
" .gprel32 2b\n" " .long 2b - .\n"
" lda %2,3b-2b(%0)\n" " lda %2,3b-2b(%0)\n"
".previous" ".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2) : "=r"(error), "=&r"(tmp1), "=&r"(tmp2)
...@@ -865,9 +865,9 @@ do_entUnaUser(void * va, unsigned long opcode, ...@@ -865,9 +865,9 @@ do_entUnaUser(void * va, unsigned long opcode,
" extlh %2,%3,%2\n" " extlh %2,%3,%2\n"
"3:\n" "3:\n"
".section __ex_table,\"a\"\n" ".section __ex_table,\"a\"\n"
" .gprel32 1b\n" " .long 1b - .\n"
" lda %1,3b-1b(%0)\n" " lda %1,3b-1b(%0)\n"
" .gprel32 2b\n" " .long 2b - .\n"
" lda %2,3b-2b(%0)\n" " lda %2,3b-2b(%0)\n"
".previous" ".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2) : "=r"(error), "=&r"(tmp1), "=&r"(tmp2)
...@@ -885,9 +885,9 @@ do_entUnaUser(void * va, unsigned long opcode, ...@@ -885,9 +885,9 @@ do_entUnaUser(void * va, unsigned long opcode,
" extqh %2,%3,%2\n" " extqh %2,%3,%2\n"
"3:\n" "3:\n"
".section __ex_table,\"a\"\n" ".section __ex_table,\"a\"\n"
" .gprel32 1b\n" " .long 1b - .\n"
" lda %1,3b-1b(%0)\n" " lda %1,3b-1b(%0)\n"
" .gprel32 2b\n" " .long 2b - .\n"
" lda %2,3b-2b(%0)\n" " lda %2,3b-2b(%0)\n"
".previous" ".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2) : "=r"(error), "=&r"(tmp1), "=&r"(tmp2)
...@@ -905,9 +905,9 @@ do_entUnaUser(void * va, unsigned long opcode, ...@@ -905,9 +905,9 @@ do_entUnaUser(void * va, unsigned long opcode,
" extlh %2,%3,%2\n" " extlh %2,%3,%2\n"
"3:\n" "3:\n"
".section __ex_table,\"a\"\n" ".section __ex_table,\"a\"\n"
" .gprel32 1b\n" " .long 1b - .\n"
" lda %1,3b-1b(%0)\n" " lda %1,3b-1b(%0)\n"
" .gprel32 2b\n" " .long 2b - .\n"
" lda %2,3b-2b(%0)\n" " lda %2,3b-2b(%0)\n"
".previous" ".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2) : "=r"(error), "=&r"(tmp1), "=&r"(tmp2)
...@@ -925,9 +925,9 @@ do_entUnaUser(void * va, unsigned long opcode, ...@@ -925,9 +925,9 @@ do_entUnaUser(void * va, unsigned long opcode,
" extqh %2,%3,%2\n" " extqh %2,%3,%2\n"
"3:\n" "3:\n"
".section __ex_table,\"a\"\n" ".section __ex_table,\"a\"\n"
" .gprel32 1b\n" " .long 1b - .\n"
" lda %1,3b-1b(%0)\n" " lda %1,3b-1b(%0)\n"
" .gprel32 2b\n" " .long 2b - .\n"
" lda %2,3b-2b(%0)\n" " lda %2,3b-2b(%0)\n"
".previous" ".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2) : "=r"(error), "=&r"(tmp1), "=&r"(tmp2)
...@@ -954,13 +954,13 @@ do_entUnaUser(void * va, unsigned long opcode, ...@@ -954,13 +954,13 @@ do_entUnaUser(void * va, unsigned long opcode,
"4: stq_u %1,0(%5)\n" "4: stq_u %1,0(%5)\n"
"5:\n" "5:\n"
".section __ex_table,\"a\"\n" ".section __ex_table,\"a\"\n"
" .gprel32 1b\n" " .long 1b - .\n"
" lda %2,5b-1b(%0)\n" " lda %2,5b-1b(%0)\n"
" .gprel32 2b\n" " .long 2b - .\n"
" lda %1,5b-2b(%0)\n" " lda %1,5b-2b(%0)\n"
" .gprel32 3b\n" " .long 3b - .\n"
" lda $31,5b-3b(%0)\n" " lda $31,5b-3b(%0)\n"
" .gprel32 4b\n" " .long 4b - .\n"
" lda $31,5b-4b(%0)\n" " lda $31,5b-4b(%0)\n"
".previous" ".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2), : "=r"(error), "=&r"(tmp1), "=&r"(tmp2),
...@@ -988,13 +988,13 @@ do_entUnaUser(void * va, unsigned long opcode, ...@@ -988,13 +988,13 @@ do_entUnaUser(void * va, unsigned long opcode,
"4: stq_u %1,0(%5)\n" "4: stq_u %1,0(%5)\n"
"5:\n" "5:\n"
".section __ex_table,\"a\"\n" ".section __ex_table,\"a\"\n"
" .gprel32 1b\n" " .long 1b - .\n"
" lda %2,5b-1b(%0)\n" " lda %2,5b-1b(%0)\n"
" .gprel32 2b\n" " .long 2b - .\n"
" lda %1,5b-2b(%0)\n" " lda %1,5b-2b(%0)\n"
" .gprel32 3b\n" " .long 3b - .\n"
" lda $31,5b-3b(%0)\n" " lda $31,5b-3b(%0)\n"
" .gprel32 4b\n" " .long 4b - .\n"
" lda $31,5b-4b(%0)\n" " lda $31,5b-4b(%0)\n"
".previous" ".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2), : "=r"(error), "=&r"(tmp1), "=&r"(tmp2),
...@@ -1022,13 +1022,13 @@ do_entUnaUser(void * va, unsigned long opcode, ...@@ -1022,13 +1022,13 @@ do_entUnaUser(void * va, unsigned long opcode,
"4: stq_u %1,0(%5)\n" "4: stq_u %1,0(%5)\n"
"5:\n" "5:\n"
".section __ex_table,\"a\"\n\t" ".section __ex_table,\"a\"\n\t"
" .gprel32 1b\n" " .long 1b - .\n"
" lda %2,5b-1b(%0)\n" " lda %2,5b-1b(%0)\n"
" .gprel32 2b\n" " .long 2b - .\n"
" lda %1,5b-2b(%0)\n" " lda %1,5b-2b(%0)\n"
" .gprel32 3b\n" " .long 3b - .\n"
" lda $31,5b-3b(%0)\n" " lda $31,5b-3b(%0)\n"
" .gprel32 4b\n" " .long 4b - .\n"
" lda $31,5b-4b(%0)\n" " lda $31,5b-4b(%0)\n"
".previous" ".previous"
: "=r"(error), "=&r"(tmp1), "=&r"(tmp2), : "=r"(error), "=&r"(tmp1), "=&r"(tmp2),
......
arch/alpha/lib/csum_partial_copy.c
View file @ de4ab2e3
...@@ -46,7 +46,7 @@ __asm__ __volatile__("insqh %1,%2,%0":"=r" (z):"r" (x),"r" (y)) ...@@ -46,7 +46,7 @@ __asm__ __volatile__("insqh %1,%2,%0":"=r" (z):"r" (x),"r" (y))
"1: ldq_u %0,%2\n" \ "1: ldq_u %0,%2\n" \
"2:\n" \ "2:\n" \
".section __ex_table,\"a\"\n" \ ".section __ex_table,\"a\"\n" \
" .gprel32 1b\n" \ " .long 1b - .\n" \
" lda %0,2b-1b(%1)\n" \ " lda %0,2b-1b(%1)\n" \
".previous" \ ".previous" \
: "=r"(x), "=r"(__guu_err) \ : "=r"(x), "=r"(__guu_err) \
...@@ -61,7 +61,7 @@ __asm__ __volatile__("insqh %1,%2,%0":"=r" (z):"r" (x),"r" (y)) ...@@ -61,7 +61,7 @@ __asm__ __volatile__("insqh %1,%2,%0":"=r" (z):"r" (x),"r" (y))
"1: stq_u %2,%1\n" \ "1: stq_u %2,%1\n" \
"2:\n" \ "2:\n" \
".section __ex_table,\"a\"\n" \ ".section __ex_table,\"a\"\n" \
" .gprel32 1b" \ " .long 1b - ." \
" lda $31,2b-1b(%0)\n" \ " lda $31,2b-1b(%0)\n" \
".previous" \ ".previous" \
: "=r"(__puu_err) \ : "=r"(__puu_err) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7