97 lines
3.2 KiB
Diff
97 lines
3.2 KiB
Diff
|
From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Andy Polyakov <appro@openssl.org>
|
||
|
|
Date: Sun, 5 May 2019 18:25:50 +0200
|
||
|
|
Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
This is a big endian ELFv2 configuration. ELFv2 was already being
|
||
|
|
used for little endian, and big endian was traditionally ELFv1
|
||
|
|
but there are practical configurations that use ELFv2 with big
|
||
|
|
endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
|
||
|
|
|
||
|
|
Reviewed-by: Paul Dale <paul.dale@oracle.com>
|
||
|
|
Reviewed-by: Richard Levitte <levitte@openssl.org>
|
||
|
|
(Merged from https://github.com/openssl/openssl/pull/8883)
|
||
|
|
---
|
||
|
|
crypto/perlasm/ppc-xlate.pl | 8 ++++----
|
||
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
|
||
|
|
index e52f2f6ea62..5fcd0526dff 100755
|
||
|
|
--- a/crypto/perlasm/ppc-xlate.pl
|
||
|
|
+++ b/crypto/perlasm/ppc-xlate.pl
|
||
|
|
@@ -49,7 +49,7 @@
|
||
|
|
/osx/ && do { $name = "_$name";
|
||
|
|
last;
|
||
|
|
};
|
||
|
|
- /linux.*(32|64le)/
|
||
|
|
+ /linux.*(32|64(le|v2))/
|
||
|
|
&& do { $ret .= ".globl $name";
|
||
|
|
if (!$$type) {
|
||
|
|
$ret .= "\n.type $name,\@function";
|
||
|
|
@@ -80,7 +80,7 @@
|
||
|
|
};
|
||
|
|
my $text = sub {
|
||
|
|
my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
|
||
|
|
- $ret = ".abiversion 2\n".$ret if ($flavour =~ /linux.*64le/);
|
||
|
|
+ $ret = ".abiversion 2\n".$ret if ($flavour =~ /linux.*64(le|v2)/);
|
||
|
|
$ret;
|
||
|
|
};
|
||
|
|
my $machine = sub {
|
||
|
|
@@ -186,7 +186,7 @@
|
||
|
|
|
||
|
|
# Some ABIs specify vrsave, special-purpose register #256, as reserved
|
||
|
|
# for system use.
|
||
|
|
-my $no_vrsave = ($flavour =~ /aix|linux64le/);
|
||
|
|
+my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
|
||
|
|
my $mtspr = sub {
|
||
|
|
my ($f,$idx,$ra) = @_;
|
||
|
|
if ($idx == 256 && $no_vrsave) {
|
||
|
|
@@ -318,7 +318,7 @@ sub vfour {
|
||
|
|
if ($label) {
|
||
|
|
my $xlated = ($GLOBALS{$label} or $label);
|
||
|
|
print "$xlated:";
|
||
|
|
- if ($flavour =~ /linux.*64le/) {
|
||
|
|
+ if ($flavour =~ /linux.*64(le|v2)/) {
|
||
|
|
if ($TYPES{$label} =~ /function/) {
|
||
|
|
printf "\n.localentry %s,0\n",$xlated;
|
||
|
|
}
|
||
|
|
|
||
|
|
From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Andy Polyakov <appro@openssl.org>
|
||
|
|
Date: Sun, 5 May 2019 18:30:55 +0200
|
||
|
|
Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
|
||
|
|
|
||
|
|
If _CALL_ELF is defined to be 2, it's an ELFv2 system.
|
||
|
|
Conditionally switch to the v2 perlasm scheme.
|
||
|
|
|
||
|
|
Reviewed-by: Paul Dale <paul.dale@oracle.com>
|
||
|
|
Reviewed-by: Richard Levitte <levitte@openssl.org>
|
||
|
|
(Merged from https://github.com/openssl/openssl/pull/8883)
|
||
|
|
---
|
||
|
|
Configure | 10 +++++++---
|
||
|
|
1 file changed, 7 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Configure b/Configure
|
||
|
|
index 22082deb4c7..e303d98deb3 100755
|
||
|
|
--- a/Configure
|
||
|
|
+++ b/Configure
|
||
|
|
@@ -1402,8 +1402,15 @@
|
||
|
|
my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
|
||
|
|
my %predefined_CXX = $config{CXX}
|
||
|
|
? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
|
||
|
|
: ();
|
||
|
|
|
||
|
|
+unless ($disabled{asm}) {
|
||
|
|
+ # big endian systems can use ELFv2 ABI
|
||
|
|
+ if ($target eq "linux-ppc64") {
|
||
|
|
+ $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
|
||
|
|
+ }
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
# Check for makedepend capabilities.
|
||
|
|
if (!$disabled{makedepend}) {
|
||
|
|
if ($config{target} =~ /^(VC|vms)-/) {
|