68 lines
2 KiB
Diff
68 lines
2 KiB
Diff
From f038a42f547836ecb61b2a7ce1c50542df2ac769 Mon Sep 17 00:00:00 2001
|
|
From: Aurelien Jarno <aurelien@aurel32.net>
|
|
Date: Wed, 3 Aug 2016 00:22:44 +0200
|
|
Subject: [PATCH 05] powerpc: fix ifunc-sel.h fix asm constraints and
|
|
clobber list
|
|
|
|
As pointer out on the mailing list, the inline assembly code in
|
|
sysdeps/powerpc/ifunc-sel.h doesn't have a list of clobbered registers
|
|
and used wrong constraints.
|
|
|
|
This patch fixes that. I verified it doesn't introduce any change in the
|
|
generated code.
|
|
|
|
Changelog:
|
|
* sysdeps/powerpc/ifunc-sel.h (ifunc_sel): Add "11", "12", "cr0" to the
|
|
clobber list. Use "i" constraint instead of "X".
|
|
(ifunc_one): Add "12" to the clobber list. Use "i" constraint instead
|
|
of "X".
|
|
|
|
(cherry picked from commit 30f926d3b3dcb74c038155715ed341d5c4b334eb)
|
|
---
|
|
ChangeLog | 4 ++++
|
|
sysdeps/powerpc/ifunc-sel.h | 6 ++++--
|
|
2 files changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index 16aa09d..7ef0fe6 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -2,6 +2,10 @@
|
|
|
|
* sysdeps/powerpc/ifunc-sel.h (ifunc_sel): Replace beqlr instructions
|
|
by beq instructions jumping to the end of the function.
|
|
+ * sysdeps/powerpc/ifunc-sel.h (ifunc_sel): Add "11", "12", "cr0" to the
|
|
+ clobber list. Use "i" constraint instead of "X".
|
|
+ (ifunc_one): Add "12" to the clobber list. Use "i" constraint instead
|
|
+ of "X".
|
|
|
|
2016-08-04 Carlos O'Donell <carlos@redhat.com>
|
|
|
|
diff --git a/sysdeps/powerpc/ifunc-sel.h b/sysdeps/powerpc/ifunc-sel.h
|
|
index 79d110f..ac589bd 100644
|
|
--- a/sysdeps/powerpc/ifunc-sel.h
|
|
+++ b/sysdeps/powerpc/ifunc-sel.h
|
|
@@ -26,7 +26,8 @@ ifunc_sel (int (*f1) (void), int (*f2) (void), int (*f3) (void))
|
|
"addi %0,%0,%4-1b@l\n\t"
|
|
"2:"
|
|
: "=r" (ret)
|
|
- : "X" (&global), "X" (f1), "X" (f2), "X" (f3));
|
|
+ : "i" (&global), "i" (f1), "i" (f2), "i" (f3)
|
|
+ : "11", "12", "cr0");
|
|
return ret;
|
|
}
|
|
|
|
@@ -41,7 +42,8 @@ ifunc_one (int (*f1) (void))
|
|
"addis %0,%0,%1-1b@ha\n\t"
|
|
"addi %0,%0,%1-1b@l"
|
|
: "=r" (ret)
|
|
- : "X" (f1));
|
|
+ : "i" (f1)
|
|
+ : "12");
|
|
return ret;
|
|
}
|
|
#endif
|
|
--
|
|
2.7.4.GIT
|
|
|
|
|