summaryrefslogtreecommitdiffstats
path: root/Configurations
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-11-15 09:53:01 +0100
committerRichard Levitte <richard@levitte.org>2016-11-16 14:11:11 +0100
commita68382de5e2e528d5026d29666f4abbc7c43743a (patch)
tree69d9abd3837ca86f5874ebbd552c994046148c68 /Configurations
parentb5c8f42c9b9fce5d1b14866306e7a11e16275942 (diff)
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@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1924) (cherry picked from commit 7fbc0bfdd7a3c46bc7e36b191d11ab3853555a25)
Diffstat (limited to 'Configurations')
-rw-r--r--Configurations/10-main.conf17
1 files changed, 17 insertions, 0 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 96401f45c0..425ab2b786 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -738,6 +738,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",
@@ -755,6 +757,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"),