[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Wed Nov 16 13:08:48 UTC 2016
The branch master has been updated
via 27a451e3739d8331b9c180b0373b88ab6c382409 (commit)
via 7fbc0bfdd7a3c46bc7e36b191d11ab3853555a25 (commit)
from f43cb3f809b88c847a98b45676a8cf6d80388776 (commit)
- Log -----------------------------------------------------------------
commit 27a451e3739d8331b9c180b0373b88ab6c382409
Author: Richard Levitte <levitte at openssl.org>
Date: Tue Nov 15 09:56:20 2016 +0100
On x86 machines where the compiler supports -m32, use 'linux-x86'
The rationale is that the linux-x86 is the most likely config target
to evolve and should therefore be chosen when possible, while
linux-elf is mostly reserved for older Linux machines.
Reviewed-by: Andy Polyakov <appro at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1924)
commit 7fbc0bfdd7a3c46bc7e36b191d11ab3853555a25
Author: Richard Levitte <levitte at openssl.org>
Date: Tue Nov 15 09:53:01 2016 +0100
Add a modern linux-x86 config target
'linux-x86' is similar to 'linux-x86_64' but uses -m32 rather than -m64.
Reviewed-by: Andy Polyakov <appro at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1924)
-----------------------------------------------------------------------
Summary of changes:
Configurations/10-main.conf | 17 +++++++++++++++++
config | 9 ++++++++-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 3aa519c..6b0f368 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -731,6 +731,8 @@ sub vms_info {
},
#### IA-32 targets...
+ #### These two targets are a bit aged and are to be used on older Linux
+ #### machines where gcc doesn't understand -m32 and -m64
"linux-elf" => {
inherit_from => [ "linux-generic32", asm("x86_elf_asm") ],
cflags => add(picker(default => "-DL_ENDIAN",
@@ -748,6 +750,21 @@ sub vms_info {
perlasm_scheme => "a.out",
},
+ #### X86 / X86_64 targets
+ "linux-x86" => {
+ inherit_from => [ "linux-generic32", asm("x86_asm") ],
+ cflags => add(picker(default => "-m32 -DL_ENDIAN",
+ release => "-fomit-frame-pointer")),
+ bn_ops => "BN_LLONG",
+ perlasm_scheme => "elf",
+ shared_ldflag => add("-m32"),
+ },
+ "linux-x86-clang" => {
+ inherit_from => [ "linux-x86" ],
+ cc => "clang",
+ cxx => "clang++",
+ cflags => add("-Wextra -Qunused-arguments"),
+ },
"linux-x86_64" => {
inherit_from => [ "linux-generic64", asm("x86_64_asm") ],
cflags => add("-m64 -DL_ENDIAN"),
diff --git a/config b/config
index b8a787c..4e7fd10 100755
--- a/config
+++ b/config
@@ -640,7 +640,14 @@ case "$GUESSOS" in
else
OUT="linux-x86_64"
fi ;;
- *86-*-linux2) OUT="linux-elf" ;;
+ *86-*-linux2)
+ # On machines where the compiler understands -m32, prefer a
+ # config target that uses it
+ if $CC -m32 -E -x c /dev/null > /dev/null 2>&1; then
+ OUT="linux-x86"
+ else
+ OUT="linux-elf"
+ fi ;;
*86-*-linux1) OUT="linux-aout" ;;
*-*-linux?) OUT="linux-generic32" ;;
sun4[uv]*-*-solaris2)
More information about the openssl-commits
mailing list