Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1246 from nikkon-dev/spaun2002/add_glibc_2_19_patch
Add powerpc asm fix for glibc 2.19
- Loading branch information
Showing
5 changed files
with
245 additions
and
0 deletions.
There are no files selected for viewing
49 changes: 49 additions & 0 deletions
49
packages/glibc/2.19/0017-Fix-cmpli-usage-in-power6-memset.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| Author: Joseph Myers <joseph@codesourcery.com> | ||
| Date: 2016-10-24 | ||
|
|
||
| Building glibc for powerpc64 with recent (2.27.51.20161012) binutils, | ||
| with multi-arch enabled, I get the error: | ||
|
|
||
| ../sysdeps/powerpc/powerpc64/power6/memset.S: Assembler messages: | ||
| ../sysdeps/powerpc/powerpc64/power6/memset.S:254: Error: operand out of range (5 is not between 0 and 1) | ||
| ../sysdeps/powerpc/powerpc64/power6/memset.S:254: Error: operand out of range (128 is not between 0 and 31) | ||
| ../sysdeps/powerpc/powerpc64/power6/memset.S:254: Error: missing operand | ||
|
|
||
| Indeed, cmpli is documented as a four-operand instruction, and looking | ||
| at nearby code it seems likely cmpldi was intended. This patch fixes | ||
| this powerpc64 code accordingly, and makes a corresponding change to | ||
| the powerpc32 code. | ||
|
|
||
| Note: this patch is not tested beyond verifying that the powerpc64 | ||
| code builds where it failed to build before the patch. In particular, | ||
| I have not done execution testing (the systems I usually use for | ||
| testing powerpc are pre-power6 so wouldn't use this code) or tested | ||
| the powerpc32 change. | ||
|
|
||
| --- | ||
| sysdeps/powerpc/powerpc32/power6/memset.S (memset): Use cmplwi instead of cmpli. | ||
| sysdeps/powerpc/powerpc64/power6/memset.S (memset): Use cmpldi instead of cmpli. | ||
|
|
||
| --- a/sysdeps/powerpc/powerpc32/power6/memset.S | ||
| +++ b/sysdeps/powerpc/powerpc32/power6/memset.S | ||
| @@ -394,7 +394,7 @@ L(cacheAlignedx): | ||
| /* A simple loop for the longer (>640 bytes) lengths. This form limits | ||
| the branch miss-predicted to exactly 1 at loop exit.*/ | ||
| L(cacheAligned512): | ||
| - cmpli cr1,rLEN,128 | ||
| + cmplwi cr1,rLEN,128 | ||
| blt cr1,L(cacheAligned1) | ||
| dcbz 0,rMEMP | ||
| addi rLEN,rLEN,-128 | ||
|
|
||
| --- a/sysdeps/powerpc/powerpc64/power6/memset.S | ||
| +++ b/sysdeps/powerpc/powerpc64/power6/memset.S | ||
| @@ -251,7 +251,7 @@ L(cacheAlignedx): | ||
| /* A simple loop for the longer (>640 bytes) lengths. This form limits | ||
| the branch miss-predicted to exactly 1 at loop exit.*/ | ||
| L(cacheAligned512): | ||
| - cmpli cr1,rLEN,128 | ||
| + cmpldi cr1,rLEN,128 | ||
| blt cr1,L(cacheAligned1) | ||
| dcbz 0,rMEMP | ||
| addi rLEN,rLEN,-128 |
49 changes: 49 additions & 0 deletions
49
packages/glibc/2.20/0017-Fix-cmpli-usage-in-power6-memset.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| Author: Joseph Myers <joseph@codesourcery.com> | ||
| Date: 2016-10-24 | ||
|
|
||
| Building glibc for powerpc64 with recent (2.27.51.20161012) binutils, | ||
| with multi-arch enabled, I get the error: | ||
|
|
||
| ../sysdeps/powerpc/powerpc64/power6/memset.S: Assembler messages: | ||
| ../sysdeps/powerpc/powerpc64/power6/memset.S:254: Error: operand out of range (5 is not between 0 and 1) | ||
| ../sysdeps/powerpc/powerpc64/power6/memset.S:254: Error: operand out of range (128 is not between 0 and 31) | ||
| ../sysdeps/powerpc/powerpc64/power6/memset.S:254: Error: missing operand | ||
|
|
||
| Indeed, cmpli is documented as a four-operand instruction, and looking | ||
| at nearby code it seems likely cmpldi was intended. This patch fixes | ||
| this powerpc64 code accordingly, and makes a corresponding change to | ||
| the powerpc32 code. | ||
|
|
||
| Note: this patch is not tested beyond verifying that the powerpc64 | ||
| code builds where it failed to build before the patch. In particular, | ||
| I have not done execution testing (the systems I usually use for | ||
| testing powerpc are pre-power6 so wouldn't use this code) or tested | ||
| the powerpc32 change. | ||
|
|
||
| --- | ||
| sysdeps/powerpc/powerpc32/power6/memset.S (memset): Use cmplwi instead of cmpli. | ||
| sysdeps/powerpc/powerpc64/power6/memset.S (memset): Use cmpldi instead of cmpli. | ||
|
|
||
| --- a/sysdeps/powerpc/powerpc32/power6/memset.S | ||
| +++ b/sysdeps/powerpc/powerpc32/power6/memset.S | ||
| @@ -394,7 +394,7 @@ L(cacheAlignedx): | ||
| /* A simple loop for the longer (>640 bytes) lengths. This form limits | ||
| the branch miss-predicted to exactly 1 at loop exit.*/ | ||
| L(cacheAligned512): | ||
| - cmpli cr1,rLEN,128 | ||
| + cmplwi cr1,rLEN,128 | ||
| blt cr1,L(cacheAligned1) | ||
| dcbz 0,rMEMP | ||
| addi rLEN,rLEN,-128 | ||
|
|
||
| --- a/sysdeps/powerpc/powerpc64/power6/memset.S | ||
| +++ b/sysdeps/powerpc/powerpc64/power6/memset.S | ||
| @@ -251,7 +251,7 @@ L(cacheAlignedx): | ||
| /* A simple loop for the longer (>640 bytes) lengths. This form limits | ||
| the branch miss-predicted to exactly 1 at loop exit.*/ | ||
| L(cacheAligned512): | ||
| - cmpli cr1,rLEN,128 | ||
| + cmpldi cr1,rLEN,128 | ||
| blt cr1,L(cacheAligned1) | ||
| dcbz 0,rMEMP | ||
| addi rLEN,rLEN,-128 |
49 changes: 49 additions & 0 deletions
49
packages/glibc/2.21/0017-Fix-cmpli-usage-in-power6-memset.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| Author: Joseph Myers <joseph@codesourcery.com> | ||
| Date: 2016-10-24 | ||
|
|
||
| Building glibc for powerpc64 with recent (2.27.51.20161012) binutils, | ||
| with multi-arch enabled, I get the error: | ||
|
|
||
| ../sysdeps/powerpc/powerpc64/power6/memset.S: Assembler messages: | ||
| ../sysdeps/powerpc/powerpc64/power6/memset.S:254: Error: operand out of range (5 is not between 0 and 1) | ||
| ../sysdeps/powerpc/powerpc64/power6/memset.S:254: Error: operand out of range (128 is not between 0 and 31) | ||
| ../sysdeps/powerpc/powerpc64/power6/memset.S:254: Error: missing operand | ||
|
|
||
| Indeed, cmpli is documented as a four-operand instruction, and looking | ||
| at nearby code it seems likely cmpldi was intended. This patch fixes | ||
| this powerpc64 code accordingly, and makes a corresponding change to | ||
| the powerpc32 code. | ||
|
|
||
| Note: this patch is not tested beyond verifying that the powerpc64 | ||
| code builds where it failed to build before the patch. In particular, | ||
| I have not done execution testing (the systems I usually use for | ||
| testing powerpc are pre-power6 so wouldn't use this code) or tested | ||
| the powerpc32 change. | ||
|
|
||
| --- | ||
| sysdeps/powerpc/powerpc32/power6/memset.S (memset): Use cmplwi instead of cmpli. | ||
| sysdeps/powerpc/powerpc64/power6/memset.S (memset): Use cmpldi instead of cmpli. | ||
|
|
||
| --- a/sysdeps/powerpc/powerpc32/power6/memset.S | ||
| +++ b/sysdeps/powerpc/powerpc32/power6/memset.S | ||
| @@ -394,7 +394,7 @@ L(cacheAlignedx): | ||
| /* A simple loop for the longer (>640 bytes) lengths. This form limits | ||
| the branch miss-predicted to exactly 1 at loop exit.*/ | ||
| L(cacheAligned512): | ||
| - cmpli cr1,rLEN,128 | ||
| + cmplwi cr1,rLEN,128 | ||
| blt cr1,L(cacheAligned1) | ||
| dcbz 0,rMEMP | ||
| addi rLEN,rLEN,-128 | ||
|
|
||
| --- a/sysdeps/powerpc/powerpc64/power6/memset.S | ||
| +++ b/sysdeps/powerpc/powerpc64/power6/memset.S | ||
| @@ -251,7 +251,7 @@ L(cacheAlignedx): | ||
| /* A simple loop for the longer (>640 bytes) lengths. This form limits | ||
| the branch miss-predicted to exactly 1 at loop exit.*/ | ||
| L(cacheAligned512): | ||
| - cmpli cr1,rLEN,128 | ||
| + cmpldi cr1,rLEN,128 | ||
| blt cr1,L(cacheAligned1) | ||
| dcbz 0,rMEMP | ||
| addi rLEN,rLEN,-128 |
49 changes: 49 additions & 0 deletions
49
packages/glibc/2.22/0017-Fix-cmpli-usage-in-power6-memset.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| Author: Joseph Myers <joseph@codesourcery.com> | ||
| Date: 2016-10-24 | ||
|
|
||
| Building glibc for powerpc64 with recent (2.27.51.20161012) binutils, | ||
| with multi-arch enabled, I get the error: | ||
|
|
||
| ../sysdeps/powerpc/powerpc64/power6/memset.S: Assembler messages: | ||
| ../sysdeps/powerpc/powerpc64/power6/memset.S:254: Error: operand out of range (5 is not between 0 and 1) | ||
| ../sysdeps/powerpc/powerpc64/power6/memset.S:254: Error: operand out of range (128 is not between 0 and 31) | ||
| ../sysdeps/powerpc/powerpc64/power6/memset.S:254: Error: missing operand | ||
|
|
||
| Indeed, cmpli is documented as a four-operand instruction, and looking | ||
| at nearby code it seems likely cmpldi was intended. This patch fixes | ||
| this powerpc64 code accordingly, and makes a corresponding change to | ||
| the powerpc32 code. | ||
|
|
||
| Note: this patch is not tested beyond verifying that the powerpc64 | ||
| code builds where it failed to build before the patch. In particular, | ||
| I have not done execution testing (the systems I usually use for | ||
| testing powerpc are pre-power6 so wouldn't use this code) or tested | ||
| the powerpc32 change. | ||
|
|
||
| --- | ||
| sysdeps/powerpc/powerpc32/power6/memset.S (memset): Use cmplwi instead of cmpli. | ||
| sysdeps/powerpc/powerpc64/power6/memset.S (memset): Use cmpldi instead of cmpli. | ||
|
|
||
| --- a/sysdeps/powerpc/powerpc32/power6/memset.S | ||
| +++ b/sysdeps/powerpc/powerpc32/power6/memset.S | ||
| @@ -394,7 +394,7 @@ L(cacheAlignedx): | ||
| /* A simple loop for the longer (>640 bytes) lengths. This form limits | ||
| the branch miss-predicted to exactly 1 at loop exit.*/ | ||
| L(cacheAligned512): | ||
| - cmpli cr1,rLEN,128 | ||
| + cmplwi cr1,rLEN,128 | ||
| blt cr1,L(cacheAligned1) | ||
| dcbz 0,rMEMP | ||
| addi rLEN,rLEN,-128 | ||
|
|
||
| --- a/sysdeps/powerpc/powerpc64/power6/memset.S | ||
| +++ b/sysdeps/powerpc/powerpc64/power6/memset.S | ||
| @@ -251,7 +251,7 @@ L(cacheAlignedx): | ||
| /* A simple loop for the longer (>640 bytes) lengths. This form limits | ||
| the branch miss-predicted to exactly 1 at loop exit.*/ | ||
| L(cacheAligned512): | ||
| - cmpli cr1,rLEN,128 | ||
| + cmpldi cr1,rLEN,128 | ||
| blt cr1,L(cacheAligned1) | ||
| dcbz 0,rMEMP | ||
| addi rLEN,rLEN,-128 |
49 changes: 49 additions & 0 deletions
49
packages/glibc/2.23/0013-Fix-cmpli-usage-in-power6-memset.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| Author: Joseph Myers <joseph@codesourcery.com> | ||
| Date: 2016-10-24 | ||
|
|
||
| Building glibc for powerpc64 with recent (2.27.51.20161012) binutils, | ||
| with multi-arch enabled, I get the error: | ||
|
|
||
| ../sysdeps/powerpc/powerpc64/power6/memset.S: Assembler messages: | ||
| ../sysdeps/powerpc/powerpc64/power6/memset.S:254: Error: operand out of range (5 is not between 0 and 1) | ||
| ../sysdeps/powerpc/powerpc64/power6/memset.S:254: Error: operand out of range (128 is not between 0 and 31) | ||
| ../sysdeps/powerpc/powerpc64/power6/memset.S:254: Error: missing operand | ||
|
|
||
| Indeed, cmpli is documented as a four-operand instruction, and looking | ||
| at nearby code it seems likely cmpldi was intended. This patch fixes | ||
| this powerpc64 code accordingly, and makes a corresponding change to | ||
| the powerpc32 code. | ||
|
|
||
| Note: this patch is not tested beyond verifying that the powerpc64 | ||
| code builds where it failed to build before the patch. In particular, | ||
| I have not done execution testing (the systems I usually use for | ||
| testing powerpc are pre-power6 so wouldn't use this code) or tested | ||
| the powerpc32 change. | ||
|
|
||
| --- | ||
| sysdeps/powerpc/powerpc32/power6/memset.S (memset): Use cmplwi instead of cmpli. | ||
| sysdeps/powerpc/powerpc64/power6/memset.S (memset): Use cmpldi instead of cmpli. | ||
|
|
||
| --- a/sysdeps/powerpc/powerpc32/power6/memset.S | ||
| +++ b/sysdeps/powerpc/powerpc32/power6/memset.S | ||
| @@ -394,7 +394,7 @@ L(cacheAlignedx): | ||
| /* A simple loop for the longer (>640 bytes) lengths. This form limits | ||
| the branch miss-predicted to exactly 1 at loop exit.*/ | ||
| L(cacheAligned512): | ||
| - cmpli cr1,rLEN,128 | ||
| + cmplwi cr1,rLEN,128 | ||
| blt cr1,L(cacheAligned1) | ||
| dcbz 0,rMEMP | ||
| addi rLEN,rLEN,-128 | ||
|
|
||
| --- a/sysdeps/powerpc/powerpc64/power6/memset.S | ||
| +++ b/sysdeps/powerpc/powerpc64/power6/memset.S | ||
| @@ -251,7 +251,7 @@ L(cacheAlignedx): | ||
| /* A simple loop for the longer (>640 bytes) lengths. This form limits | ||
| the branch miss-predicted to exactly 1 at loop exit.*/ | ||
| L(cacheAligned512): | ||
| - cmpli cr1,rLEN,128 | ||
| + cmpldi cr1,rLEN,128 | ||
| blt cr1,L(cacheAligned1) | ||
| dcbz 0,rMEMP | ||
| addi rLEN,rLEN,-128 |