diff options
| author | Andy Polyakov <appro@openssl.org> | 2016-03-11 16:47:02 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-14 13:52:34 +0100 |
| commit | 8d51db86f7bbade81c6d6eb3357bc12ddeb12de1 (patch) | |
| tree | 34c419fecb30f3eea8f1a2aa065398ba98a45c7d /Configurations | |
| parent | 6bfb7db35a426e5f070e744b56c913c739a40634 (diff) | |
s390x assembly pack: 32-bit fixups.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/00-base-templates.conf | 2 | ||||
| -rw-r--r-- | Configurations/10-main.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index cbb5675db6..c284af6934 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -238,7 +238,7 @@ }, s390x_asm => { template => 1, - cpuid_asm_src => "s390xcap.c s390xcpuid.s", + cpuid_asm_src => "s390xcap.c s390xcpuid.S", bn_asm_src => "asm/s390x.S s390x-mont.S s390x-gf2m.s", aes_asm_src => "aes-s390x.S aes-ctr.fake aes-xts.fake", sha1_asm_src => "sha1-s390x.S sha256-s390x.S sha512-s390x.S", diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index cddf268b67..6c43772ead 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -781,7 +781,7 @@ sub vc_wince_info { # inherit_from => [ "linux-generic32", asm("s390x_asm") ], cflags => add("-m31 -Wa,-mzarch -DB_ENDIAN"), - bn_obj => sub { my $r=join(" ",@_); $r=~s/bn\-s390x/bn_asm/; $r; }, + bn_asm_src => sub { my $r=join(" ",@_); $r=~s|asm/s390x\.S|bn_asm.c|; $r; }, perlasm_scheme => "31", shared_ldflag => "-m31", multilib => "/highgprs", |