summaryrefslogtreecommitdiff
path: root/packages/glibc/2.17/0069-uses-power6-mtfsf-when-not-supported.patch
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2022-02-14 08:11:42 (GMT)
committerGitHub <noreply@github.com>2022-02-14 08:11:42 (GMT)
commit681aaef1f1ff39c341fdc529e0db2c14639a58d8 (patch)
treece98c2b3d9648db065d27add325370392a35d584 /packages/glibc/2.17/0069-uses-power6-mtfsf-when-not-supported.patch
parentba680a3e5b8c62a7c1554e71f6d09903dac95a2f (diff)
parent86c2982568de1ad4d4cc12a65b19231331484405 (diff)
Merge pull request #1674 from stilor/master
Updates to make `ct-ng build-all` pass
Diffstat (limited to 'packages/glibc/2.17/0069-uses-power6-mtfsf-when-not-supported.patch')
-rw-r--r--packages/glibc/2.17/0069-uses-power6-mtfsf-when-not-supported.patch25
1 files changed, 13 insertions, 12 deletions
diff --git a/packages/glibc/2.17/0069-uses-power6-mtfsf-when-not-supported.patch b/packages/glibc/2.17/0069-uses-power6-mtfsf-when-not-supported.patch
index 8864739..d99da10 100644
--- a/packages/glibc/2.17/0069-uses-power6-mtfsf-when-not-supported.patch
+++ b/packages/glibc/2.17/0069-uses-power6-mtfsf-when-not-supported.patch
@@ -6,11 +6,14 @@
* sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S
(__novec_swapcontext): Likewise.
-diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S
-index e47a57a..a1ed419 100644
+---
+ sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S | 18 ++++++++++------
+ sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S | 18 ++++++++++++----
+ 2 files changed, 26 insertions(+), 10 deletions(-)
+
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S
-@@ -79,12 +79,13 @@ ENTRY(__novec_setcontext)
+@@ -80,12 +80,13 @@
lfd fp31,(SIGCONTEXT_FP_REGS+(PT_R31*8))(r31)
lfd fp30,(SIGCONTEXT_FP_REGS+(PT_R30*8))(r31)
@@ -26,7 +29,7 @@ index e47a57a..a1ed419 100644
/* Availability of DFP indicates a 64-bit FPSCR. */
andi. r6,r5,PPC_FEATURE_HAS_DFP
beq 5f
-@@ -95,8 +96,10 @@ ENTRY(__novec_setcontext)
+@@ -96,8 +97,10 @@
5:
mtfsf 0xff,fp0
6:
@@ -38,7 +41,7 @@ index e47a57a..a1ed419 100644
lfd fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31)
lfd fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31)
lfd fp27,(SIGCONTEXT_FP_REGS+(PT_R27*8))(r31)
-@@ -362,12 +365,13 @@ L(has_no_vec):
+@@ -363,12 +366,13 @@
lfd fp31,(SIGCONTEXT_FP_REGS+(PT_R31*8))(r31)
lfd fp30,(SIGCONTEXT_FP_REGS+(PT_R30*8))(r31)
@@ -54,7 +57,7 @@ index e47a57a..a1ed419 100644
/* Availability of DFP indicates a 64-bit FPSCR. */
andi. r6,r5,PPC_FEATURE_HAS_DFP
beq 7f
-@@ -378,8 +382,10 @@ L(has_no_vec):
+@@ -379,8 +383,10 @@
7:
mtfsf 0xff,fp0
8:
@@ -66,11 +69,9 @@ index e47a57a..a1ed419 100644
lfd fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31)
lfd fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31)
lfd fp27,(SIGCONTEXT_FP_REGS+(PT_R27*8))(r31)
-diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S
-index bc02a21..b25904d 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S
-@@ -173,6 +173,10 @@ ENTRY(__novec_swapcontext)
+@@ -174,6 +174,10 @@
lfd fp0,(SIGCONTEXT_FP_REGS+(32*8))(r31)
lfd fp31,(SIGCONTEXT_FP_REGS+(PT_R31*8))(r31)
lfd fp30,(SIGCONTEXT_FP_REGS+(PT_R30*8))(r31)
@@ -81,7 +82,7 @@ index bc02a21..b25904d 100644
# ifdef _ARCH_PWR6
/* Use the extended four-operand version of the mtfsf insn. */
mtfsf 0xff,fp0,1,0
-@@ -189,8 +193,10 @@ ENTRY(__novec_swapcontext)
+@@ -190,8 +194,10 @@
5:
mtfsf 0xff,fp0
6:
@@ -93,7 +94,7 @@ index bc02a21..b25904d 100644
lfd fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31)
lfd fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31)
lfd fp27,(SIGCONTEXT_FP_REGS+(PT_R27*8))(r31)
-@@ -652,12 +658,14 @@ L(has_no_vec2):
+@@ -653,12 +659,14 @@
lfd fp0,(SIGCONTEXT_FP_REGS+(32*8))(r31)
lfd fp31,(SIGCONTEXT_FP_REGS+(PT_R31*8))(r31)
lfd fp30,(SIGCONTEXT_FP_REGS+(PT_R30*8))(r31)
@@ -110,7 +111,7 @@ index bc02a21..b25904d 100644
/* Availability of DFP indicates a 64-bit FPSCR. */
andi. r6,r8,PPC_FEATURE_HAS_DFP
beq 7f
-@@ -668,8 +676,10 @@ L(has_no_vec2):
+@@ -669,8 +677,10 @@
7:
mtfsf 0xff,fp0
8: