Skip to content

Commit cedc607

Browse files
Merge pull request #7 from McdonaldSeanp/PA-1941/openssl-1.1.0
(PA-2135) Turn down optimization on aarch for SSL
2 parents eb16100 + 3e4231b commit cedc607

File tree

2 files changed

+37
-0
lines changed

2 files changed

+37
-0
lines changed

configs/components/openssl-1.1.0.rb

+6
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,12 @@
7575
# CONFIGURE
7676
###########
7777

78+
# OpenSSL fails to work on aarch unless we turn down the compiler optimization.
79+
# See PA-2135 for details
80+
if platform.architecture =~ /aarch/
81+
pkg.apply_patch 'resources/patches/openssl/turn-down-optimization-on-aarch.patch'
82+
end
83+
7884
# OpenSSL Configure doesn't honor CFLAGS or LDFLAGS as environment variables.
7985
# Instead, those should be passed to Configure at the end of its options, as
8086
# any unrecognized options are passed straight through to ${CC}. Defining
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
From 845158cf536f6a7f9a023585ef923d97f016ac59 Mon Sep 17 00:00:00 2001
2+
From: "Sean P. McDonald" <[email protected]>
3+
Date: Thu, 2 Aug 2018 15:49:46 -0700
4+
Subject: [PATCH] turn down optimization on aarch
5+
# OpenSSL is failing to operate on aarch64 linux when built in a standard
6+
# format. Per suggestion of OpenSSL themselves
7+
# https://github.com/openssl/openssl/blob/OpenSSL_1_1_0h/INSTALL#L678L680
8+
# this commit patches the ssl configuration to use -O2 instead of -O3 when
9+
# compiling the tool. This seems to have fixed the issue
10+
# - Sean P. McDonald 8/3/18
11+
12+
---
13+
Configurations/10-main.conf | 2 +-
14+
1 file changed, 1 insertion(+), 1 deletion(-)
15+
16+
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
17+
index b49f04b5d7..3f61b7c318 100644
18+
--- a/Configurations/10-main.conf
19+
+++ b/Configurations/10-main.conf
20+
@@ -633,7 +633,7 @@ sub vms_info {
21+
cc => "gcc",
22+
cflags => combine(picker(default => "-Wall",
23+
debug => "-O0 -g",
24+
- release => "-O3"),
25+
+ release => "-O2"),
26+
threads("-pthread")),
27+
ex_libs => add("-ldl", threads("-pthread")),
28+
bn_ops => "BN_LLONG RC4_CHAR",
29+
--
30+
2.18.0.windows.1
31+

0 commit comments

Comments
 (0)