861ac185a6
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
From 4d6d2866ae43e55325e8ee96561221804602cd7a Mon Sep 17 00:00:00 2001
|
|
From: Samuel Holland <samuel@sholland.org>
|
|
Date: Fri, 21 Feb 2020 21:06:15 -0600
|
|
Subject: [PATCH] Update powerpc sysv assembly for ffi_powerpc.h changes (#541)
|
|
|
|
Some of the flag bits were moved when adding powerpc64 vector support.
|
|
|
|
Fixes #536
|
|
---
|
|
src/powerpc/sysv.S | 12 +++++-------
|
|
1 file changed, 5 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/src/powerpc/sysv.S b/src/powerpc/sysv.S
|
|
index 1474ce70..df977342 100644
|
|
--- a/src/powerpc/sysv.S
|
|
+++ b/src/powerpc/sysv.S
|
|
@@ -104,17 +104,16 @@ ENTRY(ffi_call_SYSV)
|
|
bctrl
|
|
|
|
/* Now, deal with the return value. */
|
|
- mtcrf 0x01,%r31 /* cr7 */
|
|
+ mtcrf 0x03,%r31 /* cr6-cr7 */
|
|
bt- 31,L(small_struct_return_value)
|
|
bt- 30,L(done_return_value)
|
|
#ifndef __NO_FPRS__
|
|
bt- 29,L(fp_return_value)
|
|
#endif
|
|
stw %r3,0(%r30)
|
|
- bf+ 28,L(done_return_value)
|
|
+ bf+ 27,L(done_return_value)
|
|
stw %r4,4(%r30)
|
|
- mtcrf 0x02,%r31 /* cr6 */
|
|
- bf 27,L(done_return_value)
|
|
+ bf 26,L(done_return_value)
|
|
stw %r5,8(%r30)
|
|
stw %r6,12(%r30)
|
|
/* Fall through... */
|
|
@@ -145,10 +144,9 @@ L(done_return_value):
|
|
#ifndef __NO_FPRS__
|
|
L(fp_return_value):
|
|
.cfi_restore_state
|
|
- bf 28,L(float_return_value)
|
|
+ bf 27,L(float_return_value)
|
|
stfd %f1,0(%r30)
|
|
- mtcrf 0x02,%r31 /* cr6 */
|
|
- bf 27,L(done_return_value)
|
|
+ bf 26,L(done_return_value)
|
|
stfd %f2,8(%r30)
|
|
b L(done_return_value)
|
|
L(float_return_value):
|