From 7ead0c89185c46378e3ed85c0012d083f4b3039b Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Mon, 16 Mar 2015 22:33:36 +0100 Subject: [PATCH] Configure: fold related configurations more aggressively and clean-up. Reviewed-by: Richard Levitte --- Configurations/10-main.conf | 1268 +++++++++++------------------------ Configure | 90 +-- 2 files changed, 418 insertions(+), 940 deletions(-) diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index eb467896bd..9d38554477 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -6,10 +6,12 @@ %targets = ( -# Basic configs that should work on any (32 and less bit) box +#### Basic configs that should work on any 32-bit box "gcc" => { cc => "gcc", - cflags => "-O3", + cflags => "", + debug_cflags => "-O0 -g", + release_cflags => "-O3", thread_cflag => "(unknown)", bn_ops => "BN_LLONG", }, @@ -19,9 +21,8 @@ thread_cflag => "(unknown)", }, -####VOS Configurations +#### VOS Configurations "vos-gcc" => { - inherit_from => [ "no_asm_filler" ], cc => "gcc", cflags => "-Wall -DOPENSSL_SYS_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN", debug_cflags => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG", @@ -34,15 +35,17 @@ }, #### Solaris x86 with GNU C setups -# -DOPENSSL_NO_INLINE_ASM switches off inline assembler. We have to do it -# here because whenever GNU C instantiates an assembler template it -# surrounds it with #APP #NO_APP comment pair which (at least Solaris -# 7_x86) /usr/ccs/bin/as fails to assemble with "Illegal mnemonic" -# error message. "solaris-x86-gcc" => { - inherit_from => [ "x86_elf_asm" ], - cc => "gcc", - cflags => "-O3 -fomit-frame-pointer -march=pentium -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM", + # -DOPENSSL_NO_INLINE_ASM switches off inline assembler. We have + # to do it here because whenever GNU C instantiates an assembler + # template it surrounds it with #APP #NO_APP comment pair which + # (at least Solaris 7_x86) /usr/ccs/bin/as fails to assemble + # with "Illegal mnemonic" error message. + inherit_from => [ asm("x86_elf_asm") ], + cc => "gcc", + cflags => "-march=pentium -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM", + debug_cflags => "-O0 -g", + release_cflags => "-O3 -fomit-frame-pointer", thread_cflag => "-D_REENTRANT", lflags => "-lsocket -lnsl -ldl", bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", @@ -52,18 +55,20 @@ shared_ldflag => "-shared", shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", }, -# -shared -static-libgcc might appear controversial, but modules taken -# from static libgcc do not have relocations and linking them into our -# shared objects doesn't have any negative side-effects. On the contrary, -# doing so makes it possible to use gcc shared build with Sun C. Given -# that gcc generates faster code [thanks to inline assembler], I would -# actually recommend to consider using gcc shared build even with vendor -# compiler:-) -# "solaris64-x86_64-gcc" => { - inherit_from => [ "x86_64_asm" ], - cc => "gcc", - cflags => "-m64 -O3 -Wall -DL_ENDIAN", + # -shared -static-libgcc might appear controversial, but modules + # taken from static libgcc do not have relocations and linking + # them into our shared objects doesn't have any negative side + # effects. On the contrary, doing so makes it possible to use + # gcc shared build with Sun C. Given that gcc generates faster + # code [thanks to inline assembler], I would actually recommend + # to consider using gcc shared build even with vendor compiler:-) + # + inherit_from => [ asm("x86_64_asm") ], + cc => "gcc", + cflags => "-m64 -Wall -DL_ENDIAN", + debug_cflags => "-O0 -g", + release_cflags => "-O3", thread_cflag => "-D_REENTRANT", lflags => "-lsocket -lnsl -ldl", bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", @@ -78,9 +83,10 @@ #### Solaris x86 with Sun C setups "solaris-x86-cc" => { - inherit_from => [ "no_asm_filler" ], cc => "cc", - cflags => "-fast -xarch=generic -O -Xa", + cflags => "-xarch=generic -xstrconst -Xa -DL_ENDIAN", + debug_cflags => "-g", + release_cflags => "-xO5 -xregs=frameptr -xdepend -xbuiltin", thread_cflag => "-D_REENTRANT", lflags => "-lsocket -lnsl -ldl", bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR", @@ -91,9 +97,11 @@ shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", }, "solaris64-x86_64-cc" => { - inherit_from => [ "x86_64_asm" ], + inherit_from => [ asm("x86_64_asm") ], cc => "cc", - cflags => "-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN", + cflags => "-xarch=generic64 -xstrconst -Xa -DL_ENDIAN", + debug_cflags => "-g", + release_cflags => "-xO5 -xdepend -xbuiltin", thread_cflag => "-D_REENTRANT", lflags => "-lsocket -lnsl -ldl", bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", @@ -101,16 +109,17 @@ dso_scheme => "dlfcn", shared_target => "solaris-shared", shared_cflag => "-KPIC", - shared_ldflag => "-xarch=amd64 -G -dy -z text", + shared_ldflag => "-xarch=generic64 -G -dy -z text", shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", multilib => "/64", }, #### SPARC Solaris with GNU C setups "solaris-sparcv7-gcc" => { - inherit_from => [ "no_asm_filler" ], cc => "gcc", - cflags => "-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W", + cflags => "-Wall -DB_ENDIAN -DBN_DIV2W", + debug_cflags => "-O0 -g", + release_cflags => "-O3", thread_cflag => "-D_REENTRANT", lflags => "-lsocket -lnsl -ldl", bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR", @@ -120,52 +129,25 @@ shared_ldflag => "-shared", shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", }, -#### "solaris-sparcv8-gcc" => { - inherit_from => [ "sparcv8_asm" ], - cc => "gcc", - cflags => "-mv8 -Wall -DB_ENDIAN", - debug_cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g", - release_cflags => "-O3 -fomit-frame-pointer -DBN_DIV2W", - thread_cflag => "-D_REENTRANT", - lflags => "-lsocket -lnsl -ldl", - bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR", - dso_scheme => "dlfcn", - shared_target => "solaris-shared", - shared_cflag => "-fPIC", - shared_ldflag => "-shared", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + inherit_from => [ "solaris-sparcv7-gcc", asm("sparcv8_asm") ], + cflags => sub { join(" ","-mv8",@_); }, }, -# -m32 should be safe to add as long as driver recognizes -mcpu=ultrasparc "solaris-sparcv9-gcc" => { - inherit_from => [ "sparcv9_asm" ], + # -m32 should be safe to add as long as driver recognizes + # -mcpu=ultrasparc + inherit_from => [ "solaris-sparcv7-gcc", asm("sparcv9_asm") ], cc => "gcc", - cflags => "-m32 -mcpu=ultrasparc -Wall -DB_ENDIAN -DBN_DIV2W", + cflags => sub { join(" ","-m32 -mcpu=ultrasparc",@_); }, debug_cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -pedantic -ansi -Wshadow -Wno-long-long -D__EXTENSIONS__", - release_cflags => "-O3 -fomit-frame-pointer", - thread_cflag => "-D_REENTRANT", - sys_id => "ULTRASPARC", - lflags => "-lsocket -lnsl -ldl", - bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR", - dso_scheme => "dlfcn", - shared_target => "solaris-shared", - shared_cflag => "-fPIC", - shared_ldflag => "-shared", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + release_cflags => "-O3", }, "solaris64-sparcv9-gcc" => { - inherit_from => [ "sparcv9_asm" ], + inherit_from => [ "solaris-sparcv9-gcc" ], cc => "gcc", - cflags => "-m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN", - thread_cflag => "-D_REENTRANT", - sys_id => "ULTRASPARC", - lflags => "-lsocket -lnsl -ldl", + cflags => "-m64 -mcpu=ultrasparc -Wall -DB_ENDIAN", bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR", - dso_scheme => "dlfcn", - shared_target => "solaris-shared", - shared_cflag => "-fPIC", shared_ldflag => "-m64 -shared", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", multilib => "/64", }, @@ -174,9 +156,10 @@ # SC4.2 is ok, better than gcc even on bn as long as you tell it -xarch=v8 # SC5.0 note: Compiler common patch 107357-01 or later is required! "solaris-sparcv7-cc" => { - inherit_from => [ "no_asm_filler" ], cc => "cc", - cflags => "-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W", + cflags => "-xstrconst -Xa -DB_ENDIAN -DBN_DIV2W", + debug_cflags => "-g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL", + release_cflags => "-xO5 -xdepend", thread_cflag => "-D_REENTRANT", lflags => "-lsocket -lnsl -ldl", bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR", @@ -188,58 +171,29 @@ }, #### "solaris-sparcv8-cc" => { - inherit_from => [ "sparcv8_asm" ], - cc => "cc", - cflags => "-xarch=v8 -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W", - debug_cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O", - release_cflags => "-xO5 -xdepend", - thread_cflag => "-D_REENTRANT", - lflags => "-lsocket -lnsl -ldl", - bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR", - dso_scheme => "dlfcn", - shared_target => "solaris-shared", - shared_cflag => "-KPIC", - shared_ldflag => "-G -dy -z text", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + inherit_from => [ "solaris-sparcv7-cc", asm("sparcv8_asm") ], + cflags => sub { join(" ","-xarch=v8",@_); }, }, "solaris-sparcv9-cc" => { - inherit_from => [ "sparcv9_asm" ], - cc => "cc", - cflags => "-xtarget=ultra -xarch=v8plus -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W", - debug_cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O", - release_cflags => "-xO5 -xdepend", - thread_cflag => "-D_REENTRANT", - sys_id => "ULTRASPARC", - lflags => "-lsocket -lnsl -ldl", - bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR", - dso_scheme => "dlfcn", - shared_target => "solaris-shared", - shared_cflag => "-KPIC", - shared_ldflag => "-G -dy -z text", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + inherit_from => [ "solaris-sparcv7-cc", asm("sparcv9_asm") ], + cflags => sub { join(" ","-xarch=v8plus -xtarget=ultra",@_); }, }, "solaris64-sparcv9-cc" => { - inherit_from => [ "sparcv9_asm" ], - cc => "cc", - cflags => "-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN", - thread_cflag => "-D_REENTRANT", - sys_id => "ULTRASPARC", - lflags => "-lsocket -lnsl -ldl", + inherit_from => [ "solaris-sparcv7-cc", asm("sparcv9_asm") ], + cflags => sub { join(" ","-xarch=v9 -xtarget=ultra",@_); }, bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR", - dso_scheme => "dlfcn", - shared_target => "solaris-shared", - shared_cflag => "-KPIC", shared_ldflag => "-xarch=v9 -G -dy -z text", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", multilib => "/64", }, #### IRIX 5.x configs # -mips2 flag is added by ./config when appropriate. "irix-gcc" => { - inherit_from => [ "mips32_asm" ], + inherit_from => [ asm("mips32_asm") ], cc => "gcc", - cflags => "-O3 -DB_ENDIAN", + cflags => "-DB_ENDIAN", + debug_cflags => "-g -O0", + release_cflags => "-O3", thread_cflag => "(unknown)", bn_ops => "BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR", perlasm_scheme => "o32", @@ -248,9 +202,11 @@ shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", }, "irix-cc" => { - inherit_from => [ "mips32_asm" ], + inherit_from => [ asm("mips32_asm") ], cc => "cc", - cflags => "-O2 -use_readonly_const -DB_ENDIAN", + cflags => "-use_readonly_const -DB_ENDIAN", + debug_cflags => "-g -O0", + release_cflags => "-O2", thread_cflag => "(unknown)", bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC2 DES_UNROLL BF_PTR", perlasm_scheme => "o32", @@ -262,9 +218,11 @@ # Only N32 and N64 ABIs are supported. If you need O32 ABI build, invoke # './Configure irix-cc -o32' manually. "irix-mips3-gcc" => { - inherit_from => [ "mips64_asm" ], + inherit_from => [ asm("mips64_asm") ], cc => "gcc", - cflags => "-mabi=n32 -O3 -DB_ENDIAN -DBN_DIV3W", + cflags => "-mabi=n32 -DB_ENDIAN -DBN_DIV3W", + debug_cflags => "-g -O0", + release_cflags => "-O3", thread_cflag => "-D_SGI_MP_SOURCE", bn_ops => "MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT", perlasm_scheme => "n32", @@ -275,9 +233,11 @@ multilib => "32", }, "irix-mips3-cc" => { - inherit_from => [ "mips64_asm" ], + inherit_from => [ asm("mips64_asm") ], cc => "cc", - cflags => "-n32 -mips3 -O2 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W", + cflags => "-n32 -mips3 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W", + debug_cflags => "-g -O0", + release_cflags => "-O2", thread_cflag => "-D_SGI_MP_SOURCE", bn_ops => "DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT", perlasm_scheme => "n32", @@ -287,11 +247,13 @@ shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", multilib => "32", }, -# N64 ABI builds. + # N64 ABI builds. "irix64-mips4-gcc" => { - inherit_from => [ "mips64_asm" ], + inherit_from => [ asm("mips64_asm") ], cc => "gcc", - cflags => "-mabi=64 -mips4 -O3 -DB_ENDIAN -DBN_DIV3W", + cflags => "-mabi=64 -mips4 -DB_ENDIAN -DBN_DIV3W", + debug_cflags => "-g -O0", + release_cflags => "-O3", thread_cflag => "-D_SGI_MP_SOURCE", bn_ops => "RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG", perlasm_scheme => "64", @@ -302,9 +264,11 @@ multilib => "64", }, "irix64-mips4-cc" => { - inherit_from => [ "mips64_asm" ], + inherit_from => [ asm("mips64_asm") ], cc => "cc", - cflags => "-64 -mips4 -O2 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W", + cflags => "-64 -mips4 -use_readonly_const -G0 -rdata_shared -DB_ENDIAN -DBN_DIV3W", + debug_cflags => "-g -O0", + release_cflags => "-O2", thread_cflag => "-D_SGI_MP_SOURCE", bn_ops => "RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG", perlasm_scheme => "64", @@ -331,36 +295,23 @@ # - Keep in mind that the HP compiler by default generates code # suitable for execution on the host you're currently compiling at. # If the toolkit is ment to be used on various PA-RISC processors -# consider './config +DAportable'. -# - +DD64 is chosen in favour of +DA2.0W because it's meant to be -# compatible with *future* releases. -# - If you run ./Configure hpux-parisc-[g]cc manually don't forget to -# pass -D_REENTRANT on HP-UX 10 and later. +# consider './Configure hpux-parisc-[g]cc +DAportable'. # - -DMD32_XARRAY triggers workaround for compiler bug we ran into in # 32-bit message digests. (For the moment of this writing) HP C # doesn't seem to "digest" too many local variables (they make "him" # chew forever:-). For more details look-up MD32_XARRAY comment in # crypto/sha/sha_lcl.h. +# - originally there were 32-bit hpux-parisc2-* targets. They were +# scrapped, because a) they were not interchangable with other 32-bit +# targets; a) when critical 32-bit assembly modules detect if they +# are executed on PA-RISC 2.0 and thus adequate performance is +# provided. # -# -# Since there is mention of this in shlib/hpux10-cc.sh - "hpux-parisc-cc-o4" => { - inherit_from => [ "no_asm_filler" ], - cc => "cc", - cflags => "-Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY", - thread_cflag => "-D_REENTRANT", - lflags => "-ldld", - bn_ops => "BN_LLONG DES_PTR DES_UNROLL DES_RISC1", - dso_scheme => "dl", - shared_target => "hpux-shared", - shared_cflag => "+Z", - shared_ldflag => "-b", - shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, "hpux-parisc-gcc" => { - inherit_from => [ "no_asm_filler" ], cc => "gcc", - cflags => "-O3 -DB_ENDIAN -DBN_DIV2W", + cflags => "-DB_ENDIAN -DBN_DIV2W", + debug_cflags => "-O0 -g", + release_cflags => "-O3", thread_cflag => "-D_REENTRANT", lflags => "-Wl,+s -ldld", bn_ops => "BN_LLONG DES_PTR DES_UNROLL DES_RISC1", @@ -371,39 +322,18 @@ shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", }, "hpux-parisc1_1-gcc" => { - inherit_from => [ "parisc11_asm" ], - cc => "gcc", - cflags => "-O3 -DB_ENDIAN -DBN_DIV2W", - thread_cflag => "-D_REENTRANT", - lflags => "-Wl,+s -ldld", - bn_ops => "BN_LLONG DES_PTR DES_UNROLL DES_RISC1", - dso_scheme => "dl", - shared_target => "hpux-shared", - shared_cflag => "-fPIC", - shared_ldflag => "-shared", - shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + inherit_from => [ "hpux-parisc-gcc", asm("parisc11_asm") ], multilib => "/pa1.1", }, - "hpux-parisc2-gcc" => { - inherit_from => [ "parisc20_32_asm" ], - cc => "gcc", - cflags => "-march=2.0 -O3 -DB_ENDIAN -D_REENTRANT", - lflags => "-Wl,+s -ldld", - bn_ops => "SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL DES_RISC1", - dso_scheme => "dl", - shared_target => "hpux-shared", - shared_cflag => "-fPIC", - shared_ldflag => "-shared", - shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - multilib => "/pa20_32", - }, "hpux64-parisc2-gcc" => { + inherit_from => [ asm("parisc20_64_asm") ], cc => "gcc", - cflags => "-O3 -DB_ENDIAN -D_REENTRANT", + cflags => "-DB_ENDIAN", + debug_cflags => "-O0 -g", + release_cflags => "-O3", + thread_cflag => "-D_REENTRANT", lflags => "-ldl", bn_ops => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT", - bn_obj => "pa-risc2W.o", - perlasm_scheme => "void", dso_scheme => "dlfcn", shared_target => "hpux-shared", shared_cflag => "-fpic", @@ -412,14 +342,15 @@ multilib => "/pa20_64", }, -# More attempts at unified 10.X and 11.X targets for HP C compiler. -# -# Chris Ruemmler -# Kevin Steves + # More attempts at unified 10.X and 11.X targets for HP C compiler. + # + # Chris Ruemmler + # Kevin Steves "hpux-parisc-cc" => { - inherit_from => [ "no_asm_filler" ], cc => "cc", - cflags => "+O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY", + cflags => "+Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY", + debug_cflags => "+O0 +d -g", + release_cflags => "+O3", thread_cflag => "-D_REENTRANT", lflags => "-Wl,+s -ldld", bn_ops => "MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT", @@ -430,36 +361,17 @@ shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", }, "hpux-parisc1_1-cc" => { - inherit_from => [ "parisc11_asm" ], - cc => "cc", - cflags => "+DA1.1 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY", - thread_cflag => "-D_REENTRANT", - lflags => "-Wl,+s -ldld", - bn_ops => "MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT", - dso_scheme => "dl", - shared_target => "hpux-shared", - shared_cflag => "+Z", - shared_ldflag => "-b", - shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + inherit_from => [ "hpux-parisc-cc", asm("parisc11_asm") ], + cflags => sub { join(" ","+DA1.1",@_); }, multilib => "/pa1.1", }, - "hpux-parisc2-cc" => { - inherit_from => [ "parisc20_32_asm" ], - cc => "cc", - cflags => "+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT", - lflags => "-Wl,+s -ldld", - bn_ops => "SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT", - dso_scheme => "dl", - shared_target => "hpux-shared", - shared_cflag => "+Z", - shared_ldflag => "-b", - shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - multilib => "/pa20_32", - }, "hpux64-parisc2-cc" => { - inherit_from => [ "parisc20_64_asm" ], + inherit_from => [ asm("parisc20_64_asm") ], cc => "cc", - cflags => "+DD64 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT", + cflags => "+DD64 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY", + debug_cflags => "+O0 +d -g", + release_cflags => "+O3", + thread_cflag => "-D_REENTRANT", lflags => "-ldl", bn_ops => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT", dso_scheme => "dlfcn", @@ -470,11 +382,14 @@ multilib => "/pa20_64", }, -# HP/UX IA-64 targets + # HP/UX IA-64 targets "hpux-ia64-cc" => { - inherit_from => [ "ia64_asm" ], + inherit_from => [ asm("ia64_asm") ], cc => "cc", - cflags => "-Ae +DD32 +O2 +Olit=all -z -DB_ENDIAN -D_REENTRANT", + cflags => "-Ae +DD32 +Olit=all -z -DB_ENDIAN", + debug_cflags => "+O0 +d -g", + release_cflags => "+O2", + thread_cflag => "-D_REENTRANT", lflags => "-ldl", bn_ops => "SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT", dso_scheme => "dlfcn", @@ -484,12 +399,15 @@ shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", multilib => "/hpux32", }, -# Frank Geurts has patiently assisted with -# with debugging of the following config. + # Frank Geurts has patiently assisted + # with debugging of the following config. "hpux64-ia64-cc" => { - inherit_from => [ "ia64_asm" ], + inherit_from => [ asm("ia64_asm") ], cc => "cc", - cflags => "-Ae +DD64 +O3 +Olit=all -z -DB_ENDIAN -D_REENTRANT", + cflags => "-Ae +DD64 +Olit=all -z -DB_ENDIAN", + debug_cflags => "+O0 +d -g", + release_cflags => "+O3", + thread_cflag => "-D_REENTRANT", lflags => "-ldl", bn_ops => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT", dso_scheme => "dlfcn", @@ -499,11 +417,14 @@ shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", multilib => "/hpux64", }, -# GCC builds... + # GCC builds... "hpux-ia64-gcc" => { - inherit_from => [ "ia64_asm" ], + inherit_from => [ asm("ia64_asm") ], cc => "gcc", - cflags => "-O3 -DB_ENDIAN -D_REENTRANT", + cflags => "-DB_ENDIAN", + debug_cflags => "-O0 -g", + release_cflags => "-O3", + thread_cflag => "-D_REENTRANT", lflags => "-ldl", bn_ops => "SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT", dso_scheme => "dlfcn", @@ -514,9 +435,12 @@ multilib => "/hpux32", }, "hpux64-ia64-gcc" => { - inherit_from => [ "ia64_asm" ], + inherit_from => [ asm("ia64_asm") ], cc => "gcc", - cflags => "-mlp64 -O3 -DB_ENDIAN -D_REENTRANT", + cflags => "-mlp64 -DB_ENDIAN", + debug_cflags => "-O0 -g", + release_cflags => "-O3", + thread_cflag => "-D_REENTRANT", lflags => "-ldl", bn_ops => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT", dso_scheme => "dlfcn", @@ -527,34 +451,6 @@ multilib => "/hpux64", }, -# Legacy HPUX 9.X configs... - "hpux-cc" => { - inherit_from => [ "no_asm_filler" ], - cc => "cc", - cflags => "-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O2 -z", - thread_cflag => "(unknown)", - lflags => "-Wl,+s -ldld", - bn_ops => "DES_PTR DES_UNROLL DES_RISC1", - dso_scheme => "dl", - shared_target => "hpux-shared", - shared_cflag => "+Z", - shared_ldflag => "-b", - shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, - "hpux-gcc" => { - inherit_from => [ "no_asm_filler" ], - cc => "gcc", - cflags => "-DB_ENDIAN -DBN_DIV2W -O3", - thread_cflag => "(unknown)", - lflags => "-Wl,+s -ldld", - bn_ops => "DES_PTR DES_UNROLL DES_RISC1", - dso_scheme => "dl", - shared_target => "hpux-shared", - shared_cflag => "-fPIC", - shared_ldflag => "-shared", - shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, - #### HP MPE/iX http://jazz.external.hp.com/src/openssl/ "MPE/iX-gcc" => { cc => "gcc", @@ -565,7 +461,7 @@ bn_ops => "BN_LLONG DES_PTR DES_UNROLL DES_RISC1", }, -# DEC Alpha OSF/1/Tru64 targets. +#### DEC Alpha OSF/1/Tru64 targets. # # "What's in a name? That which we call a rose # By any other word would smell as sweet." @@ -575,7 +471,7 @@ # For gcc, the following gave a %50 speedup on a 164 over the 'DES_INT' version # "osf1-alpha-gcc" => { - inherit_from => [ "alpha_asm" ], + inherit_from => [ asm("alpha_asm") ], cc => "gcc", cflags => "-O3", thread_cflag => "(unknown)", @@ -585,7 +481,7 @@ shared_extension => ".so", }, "osf1-alpha-cc" => { - inherit_from => [ "alpha_asm" ], + inherit_from => [ asm("alpha_asm") ], cc => "cc", cflags => "-std1 -tune host -O4 -readonly_strings", thread_cflag => "(unknown)", @@ -595,7 +491,7 @@ shared_extension => ".so", }, "tru64-alpha-cc" => { - inherit_from => [ "alpha_asm" ], + inherit_from => [ asm("alpha_asm") ], cc => "cc", cflags => "-std1 -tune host -fast -readonly_strings", thread_cflag => "-pthread", @@ -612,11 +508,10 @@ # *-generic* is endian-neutral target, but ./config is free to # throw in -D[BL]_ENDIAN, whichever appropriate... "linux-generic32" => { - inherit_from => [ "no_asm_filler" ], cc => "gcc", cflags => "-Wall", - debug_cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g", - release_cflags => "-O3 -fomit-frame-pointer", + debug_cflags => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG", + release_cflags => "-O3", thread_cflag => "-D_REENTRANT", lflags => "-ldl", bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR", @@ -625,425 +520,206 @@ shared_cflag => "-fPIC", shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", }, + "linux-generic64" => { + inherit_from => [ "linux-generic32" ], + bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR", + }, + "linux-ppc" => { - inherit_from => [ "ppc32_asm" ], - cc => "gcc", - cflags => "-DB_ENDIAN -O3 -Wall", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL", + inherit_from => [ "linux-generic32", asm("ppc32_asm") ], perlasm_scheme => "linux32", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + }, + "linux-ppc64" => { + inherit_from => [ "linux-generic64", asm("ppc64_asm") ], + cflags => "-m64 -Wall -DB_ENDIAN", + perlasm_scheme => "linux64", + shared_ldflag => "-m64", + multilib => "64", + }, + "linux-ppc64le" => { + inherit_from => [ "linux-generic64", asm("ppc64_asm") ], + cflags => "-m64 -Wall -DL_ENDIAN", + perlasm_scheme => "linux64le", + shared_ldflag => "-m64", }, -####################################################################### -# Note that -march is not among compiler options in below linux-armv4 -# target line. Not specifying one is intentional to give you choice to: -# -# a) rely on your compiler default by not specifying one; -# b) specify your target platform explicitly for optimal performance, -# e.g. -march=armv6 or -march=armv7-a; -# c) build "universal" binary that targets *range* of platforms by -# specifying minimum and maximum supported architecture; -# -# As for c) option. It actually makes no sense to specify maximum to be -# less than ARMv7, because it's the least requirement for run-time -# switch between platform-specific code paths. And without run-time -# switch performance would be equivalent to one for minimum. Secondly, -# there are some natural limitations that you'd have to accept and -# respect. Most notably you can *not* build "universal" binary for -# big-endian platform. This is because ARMv7 processor always picks -# instructions in little-endian order. Another similar limitation is -# that -mthumb can't "cross" -march=armv6t2 boundary, because that's -# where it became Thumb-2. Well, this limitation is a bit artificial, -# because it's not really impossible, but it's deemed too tricky to -# support. And of course you have to be sure that your binutils are -# actually up to the task of handling maximum target platform. With all -# this in mind here is an example of how to configure "universal" build: -# -# ./Configure linux-armv4 -march=armv6 -D__ARM_MAX_ARCH__=8 -# "linux-armv4" => { - inherit_from => [ "armv4_asm" ], - cc => "gcc", - cflags => "-O3 -Wall", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + ################################################################ + # Note that -march is not among compiler options in linux-armv4 + # target description. Not specifying one is intentional to give + # you choice to: + # + # a) rely on your compiler default by not specifying one; + # b) specify your target platform explicitly for optimal + # performance, e.g. -march=armv6 or -march=armv7-a; + # c) build "universal" binary that targets *range* of platforms + # by specifying minimum and maximum supported architecture; + # + # As for c) option. It actually makes no sense to specify + # maximum to be less than ARMv7, because it's the least + # requirement for run-time switch between platform-specific + # code paths. And without run-time switch performance would be + # equivalent to one for minimum. Secondly, there are some + # natural limitations that you'd have to accept and respect. + # Most notably you can *not* build "universal" binary for + # big-endian platform. This is because ARMv7 processor always + # picks instructions in little-endian order. Another similar + # limitation is that -mthumb can't "cross" -march=armv6t2 + # boundary, because that's where it became Thumb-2. Well, this + # limitation is a bit artificial, because it's not really + # impossible, but it's deemed too tricky to support. And of + # course you have to be sure that your binutils are actually + # up to the task of handling maximum target platform. With all + # this in mind here is an example of how to configure + # "universal" build: + # + # ./Configure linux-armv4 -march=armv6 -D__ARM_MAX_ARCH__=8 + # + inherit_from => [ "linux-generic32", asm("armv4_asm") ], + perlasm_scheme => "linux32", }, "linux-aarch64" => { - inherit_from => [ "aarch64_asm" ], - cc => "gcc", - cflags => "-O3 -Wall", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR", + inherit_from => [ "linux-generic64", asm("aarch64_asm") ], perlasm_scheme => "linux64", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", }, -# Configure script adds minimally required -march for assembly support, -# if no -march was specified at command line. mips32 and mips64 below -# refer to contemporary MIPS Architecture specifications, MIPS32 and -# MIPS64, rather than to kernel bitness. + "linux-mips32" => { - inherit_from => [ "mips32_asm" ], - cc => "gcc", - cflags => "-mabi=32 -O3 -Wall -DBN_DIV3W", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR", + # Configure script adds minimally required -march for assembly + # support, if no -march was specified at command line. + inherit_from => [ "linux-generic32", asm("mips32_asm") ], + cflags => "-mabi=32 -Wall -DBN_DIV3W", perlasm_scheme => "o32", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + shared_ldflag => "-mabi=32", }, + # mips32 and mips64 below refer to contemporary MIPS Architecture + # specifications, MIPS32 and MIPS64, rather than to kernel bitness. "linux-mips64" => { - inherit_from => [ "mips64_asm" ], - cc => "gcc", - cflags => "-mabi=n32 -O3 -Wall -DBN_DIV3W", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", + inherit_from => [ "linux-generic32", asm("mips64_asm") ], + cflags => "-mabi=n32 -Wall -DBN_DIV3W", bn_ops => "SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR", perlasm_scheme => "n32", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", shared_ldflag => "-mabi=n32", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", multilib => "32", }, "linux64-mips64" => { - inherit_from => [ "mips64_asm" ], - cc => "gcc", + inherit_from => [ "linux-generic64", asm("mips64_asm") ], cflags => "-mabi=64 -O3 -Wall -DBN_DIV3W", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR", perlasm_scheme => "64", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", shared_ldflag => "-mabi=64", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", multilib => "64", }, -#### IA-32 targets... - "linux-ia32-icc" => { - inherit_from => [ "x86_elf_asm" ], - cc => "icc", - cflags => "-DL_ENDIAN -O2", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl -no_cpprt", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-KPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, + + #### IA-32 targets... "linux-elf" => { - inherit_from => [ "x86_elf_asm" ], + inherit_from => [ "linux-generic32", asm("x86_elf_asm") ], cc => "gcc", - cflags => "-DL_ENDIAN -Wall", - debug_cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -g -march=i486", + cflags => "-march=i486 -DL_ENDIAN -Wall", + debug_cflags => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG", release_cflags => "-O3 -fomit-frame-pointer", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", debug_lflags => "-lefence", bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", }, "linux-aout" => { - inherit_from => [ "x86_asm" ], + inherit_from => [ asm("x86_asm") ], cc => "gcc", - cflags => "-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall", + cflags => "-DL_ENDIAN -march=i486 -Wall", + debug_cflags => "-O0 -g", + release_cflags => "-O3 -fomit-frame-pointer", thread_cflag => "(unknown)", bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", perlasm_scheme => "a.out", }, -#### - "linux-generic64" => { - inherit_from => [ "no_asm_filler" ], - cc => "gcc", - cflags => "-Wall", - debug_cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g", - release_cflags => "-O3", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, - "linux-ppc64" => { - inherit_from => [ "ppc64_asm" ], - cc => "gcc", - cflags => "-m64 -DB_ENDIAN -O3 -Wall", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL", - perlasm_scheme => "linux64", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_ldflag => "-m64", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - multilib => "64", - }, - "linux-ppc64le" => { - inherit_from => [ "ppc64_asm" ], - cc => "gcc", - cflags => "-m64 -DL_ENDIAN -O3 -Wall", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL", - perlasm_scheme => "linux64le", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_ldflag => "-m64", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, - "linux-ia64" => { - inherit_from => [ "ia64_asm" ], - cc => "gcc", - cflags => "-DL_ENDIAN -O3 -Wall", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, - "linux-ia64-icc" => { - inherit_from => [ "ia64_asm" ], - cc => "icc", - cflags => "-DL_ENDIAN -O2 -Wall", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl -no_cpprt", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, + "linux-x86_64" => { - inherit_from => [ "x86_64_asm" ], - cc => "gcc", + inherit_from => [ "linux-generic64", asm("x86_64_asm") ], cflags => "-m64 -DL_ENDIAN -Wall", - debug_cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g", - release_cflags => "-O3", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", - perlasm_scheme => "elf", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_ldflag => "-m64", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - multilib => "64", - }, - "linux-x86_64-clang" => { - inherit_from => [ "x86_64_asm" ], - cc => "clang", - cflags => "-m64 -DL_ENDIAN -O3 -Weverything $clang_disabled_warnings -Qunused-arguments", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", - perlasm_scheme => "elf", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_ldflag => "-m64", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - multilib => "64", - }, - "linux-x86_64-icc" => { - inherit_from => [ "x86_64_asm" ], - cc => "icc", - cflags => "-DL_ENDIAN -O2", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl -no_cpprt", bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", perlasm_scheme => "elf", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + shared_ldflag => "-m64", multilib => "64", }, + "linux-x86_64-clang" => { + inherit_from => [ "linux-x86_64" ], + cc => "clang", + cflags => "-m64 -DL_ENDIAN -Weverything $clang_disabled_warnings -Qunused-arguments", + }, "linux-x32" => { - inherit_from => [ "x86_64_asm" ], - cc => "gcc", - cflags => "-mx32 -DL_ENDIAN -O3 -Wall", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", + inherit_from => [ "linux-generic32", asm("x86_64_asm") ], + cflags => "-mx32 -DL_ENDIAN -Wall", bn_ops => "SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT DES_UNROLL", perlasm_scheme => "elf", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", shared_ldflag => "-mx32", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", multilib => "x32", }, + + "linux-ia64" => { + inherit_from => [ "linux-generic64", asm("ia64_asm") ], + bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT", + }, + "linux64-s390x" => { - inherit_from => [ "s390x_asm" ], - cc => "gcc", - cflags => "-m64 -DB_ENDIAN -O3 -Wall", + inherit_from => [ "linux-generic64", asm("s390x_asm") ], + cflags => "-m64 -Wall -DB_ENDIAN", thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL", perlasm_scheme => "64", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", shared_ldflag => "-m64", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", multilib => "64", }, -#### So called "highgprs" target for z/Architecture CPUs -# "Highgprs" is kernel feature first implemented in Linux 2.6.32, see -# /proc/cpuinfo. The idea is to preserve most significant bits of -# general purpose registers not only upon 32-bit process context -# switch, but even on asynchronous signal delivery to such process. -# This makes it possible to deploy 64-bit instructions even in legacy -# application context and achieve better [or should we say adequate] -# performance. The build is binary compatible with linux-generic32, -# and the idea is to be able to install the resulting libcrypto.so -# alongside generic one, e.g. as /lib/highgprs/libcrypto.so.x.y, for -# ldconfig and run-time linker to autodiscover. Unfortunately it -# doesn't work just yet, because of couple of bugs in glibc -# sysdeps/s390/dl-procinfo.c affecting ldconfig and ld.so.1... "linux32-s390x" => { - inherit_from => [ "s390x_32_asm" ], - cc => "gcc", - cflags => "-m31 -Wa,-mzarch -DB_ENDIAN -O3 -Wall", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL", + #### So called "highgprs" target for z/Architecture CPUs + # "Highgprs" is kernel feature first implemented in Linux + # 2.6.32, see /proc/cpuinfo. The idea is to preserve most + # significant bits of general purpose registers not only + # upon 32-bit process context switch, but even on + # asynchronous signal delivery to such process. This makes + # it possible to deploy 64-bit instructions even in legacy + # application context and achieve better [or should we say + # adequate] performance. The build is binary compatible with + # linux-generic32, and the idea is to be able to install the + # resulting libcrypto.so alongside generic one, e.g. as + # /lib/highgprs/libcrypto.so.x.y, for ldconfig and run-time + # linker to autodiscover. Unfortunately it doesn't work just + # yet, because of couple of bugs in glibc + # sysdeps/s390/dl-procinfo.c affecting ldconfig and ld.so.1... + # + inherit_from => [ "linux-generic32", asm("s390x_asm") ], + cflags => "-m31 -Wall -Wa,-mzarch -DB_ENDIAN", + bn_obj => sub { my $r=join(" ",@_); $r=~s/bn\-s390x/bn_asm/; $r; }, perlasm_scheme => "31", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", shared_ldflag => "-m31", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", multilib => "/highgprs", }, -#### SPARC Linux setups -# Ray Miller has patiently -# assisted with debugging of following two configs. + + #### SPARC Linux setups + # Ray Miller has + # patiently assisted with debugging of following two configs. "linux-sparcv8" => { - inherit_from => [ "sparcv8_asm" ], - cc => "gcc", - cflags => "-mv8 -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -DBN_DIV2W", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + inherit_from => [ "linux-generic32", asm("sparcv8_asm") ], + cflags => "-mv8 -Wall -DB_ENDIAN -DBN_DIV2W", }, -# it's a real mess with -mcpu=ultrasparc option under Linux, but -# -Wa,-Av8plus should do the trick no matter what. "linux-sparcv9" => { - inherit_from => [ "sparcv9_asm" ], - cc => "gcc", - cflags => "-m32 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W", - thread_cflag => "-D_REENTRANT", - sys_id => "ULTRASPARC", - lflags => "-ldl", - bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", + # it's a real mess with -mcpu=ultrasparc option under Linux, + # but -Wa,-Av8plus should do the trick no matter what. + inherit_from => [ "linux-generic32", asm("sparcv9_asm") ], + cflags => "-m32 -mcpu=ultrasparc -Wall -Wa,-Av8plus -DB_ENDIAN -DBN_DIV2W", shared_ldflag => "-m32", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", }, -# GCC 3.1 is a requirement "linux64-sparcv9" => { - inherit_from => [ "sparcv9_asm" ], - cc => "gcc", - cflags => "-m64 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall", - thread_cflag => "-D_REENTRANT", - sys_id => "ULTRASPARC", - lflags => "-ldl", - bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", + # GCC 3.1 is a requirement + inherit_from => [ "linux-generic64", asm("sparcv9_asm") ], + cflags => "-m64 -mcpu=ultrasparc -Wall -DB_ENDIAN", + bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR", shared_ldflag => "-m64", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", multilib => "64", }, -#### Alpha Linux with GNU C and Compaq C setups -# Special notes: -# - linux-alpha+bwx-gcc is ment to be used from ./config only. If you -# ought to run './Configure linux-alpha+bwx-gcc' manually, do -# complement the command line with -mcpu=ev56, -mcpu=ev6 or whatever -# which is appropriate. -# - If you use ccc keep in mind that -fast implies -arch host and the -# compiler is free to issue instructions which gonna make elder CPU -# choke. If you wish to build "blended" toolkit, add -arch generic -# *after* -fast and invoke './Configure linux-alpha-ccc' manually. + "linux-alpha-gcc" => { - inherit_from => [ "alpha_asm" ], - cc => "gcc", - cflags => "-O3 -DL_ENDIAN", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", + inherit_from => [ "linux-generic64", asm("alpha_asm") ], + cflags => "-DL_ENDIAN", bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, - "linux-alpha+bwx-gcc" => { - inherit_from => [ "alpha_asm" ], - cc => "gcc", - cflags => "-O3 -DL_ENDIAN", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, - "linux-alpha-ccc" => { - inherit_from => [ "alpha_asm" ], - cc => "ccc", - cflags => "-fast -readonly_strings -DL_ENDIAN", - thread_cflag => "-D_REENTRANT", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL", }, - "linux-alpha+bwx-ccc" => { - inherit_from => [ "alpha_asm" ], - cc => "ccc", - cflags => "-fast -readonly_strings -DL_ENDIAN", - thread_cflag => "-D_REENTRANT", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL", - }, -# -# TI_CGT_C6000_7.3.x is a requirement "linux-c64xplus" => { + # TI_CGT_C6000_7.3.x is a requirement cc => "cl6x", cflags => "--linux -ea=.s -eo=.o -mv6400+ -o2 -ox -ms -pden -DOPENSSL_SMALL_FOOTPRINT", thread_cflag => "-D_REENTRANT", @@ -1063,62 +739,33 @@ ranlib => "true", }, -# Android: linux-* but without pointers to headers and libs. +#### Android: linux-* but without pointers to headers and libs. "android" => { - inherit_from => [ "no_asm_filler" ], - cc => "gcc", - cflags => "-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + inherit_from => [ "linux-generic32" ], + cflags => "-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -Wall", + debug_cflags => "-O0 -g", }, "android-x86" => { - inherit_from => [ "android_x86_elf_asm" ], - cc => "gcc", - cflags => "-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", + inherit_from => [ "android", asm("x86_asm") ], + release_cflags => "-O3 -fomit-frame-pointer", bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + perlasm_scheme => "android", }, "android-armv7" => { - inherit_from => [ "armv4_asm" ], - cc => "gcc", - cflags => "-march=armv7-a -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + inherit_from => [ "android", asm("armv4_asm") ], + cflags => sub { join (" ","-march=armv7-a",@_); }, }, "android-mips" => { - inherit_from => [ "mips32_asm" ], - cc => "gcc", - cflags => "-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -Wall", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR", + inherit_from => [ "android", asm("mips32_asm") ], perlasm_scheme => "o32", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", }, #### *BSD [do see comment about ${BSDthreads} in Configure!] "BSD-generic32" => { - inherit_from => [ "no_asm_filler" ], cc => "gcc", - cflags => "-O3 -fomit-frame-pointer -Wall", + cflags => "-Wall", + debug_cflags => "-O0 -g", + release_cflags => "-O3", thread_cflag => "${BSDthreads}", bn_ops => "BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL", dso_scheme => "dlfcn", @@ -1126,94 +773,52 @@ shared_cflag => "-fPIC", shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", }, - "BSD-x86" => { - inherit_from => [ "x86_asm" ], - cc => "gcc", - cflags => "-DL_ENDIAN -O3 -fomit-frame-pointer -Wall", - thread_cflag => "${BSDthreads}", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", - perlasm_scheme => "a.out", - dso_scheme => "dlfcn", - shared_target => "bsd-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "BSD-generic64" => { + inherit_from => [ "BSD-generic32" ], + bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", }, - "BSD-x86-elf" => { - inherit_from => [ "x86_elf_asm" ], - cc => "gcc", + + "BSD-x86" => { + inherit_from => [ "BSD-generic32", asm("x86_asm") ], cflags => "-DL_ENDIAN -Wall", - debug_cflags => "-g", release_cflags => "-O3 -fomit-frame-pointer", - thread_cflag => "${BSDthreads}", bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", - dso_scheme => "dlfcn", shared_target => "bsd-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + perlasm_scheme => "a.out", }, - "BSD-sparcv8" => { - inherit_from => [ "sparcv8_asm" ], - cc => "gcc", - cflags => "-DB_ENDIAN -O3 -mv8 -Wall", - thread_cflag => "${BSDthreads}", - bn_ops => "BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL", - dso_scheme => "dlfcn", - shared_target => "bsd-gcc-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "BSD-x86-elf" => { + inherit_from => [ "BSD-x86" ], + perlasm_scheme => "elf", }, - "BSD-generic64" => { - inherit_from => [ "no_asm_filler" ], - cc => "gcc", - cflags => "-O3 -Wall", - thread_cflag => "${BSDthreads}", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", - dso_scheme => "dlfcn", - shared_target => "bsd-gcc-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "BSD-sparcv8" => { + inherit_from => [ "BSD-generic32", asm("sparcv8_asm") ], + cflags => "-mv8 -Wall -DB_ENDIAN", }, -# -DMD32_REG_T=int doesn't actually belong in sparc64 target, it -# simply *happens* to work around a compiler bug in gcc 3.3.3, -# triggered by RIPEMD160 code. "BSD-sparc64" => { - inherit_from => [ "sparcv9_asm" ], - cc => "gcc", - cflags => "-DB_ENDIAN -O3 -DMD32_REG_T=int -Wall", - thread_cflag => "${BSDthreads}", + # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it + # simply *happens* to work around a compiler bug in gcc 3.3.3, + # triggered by RIPEMD160 code. + inherit_from => [ "BSD-generic64", asm("sparcv9_asm") ], + cflags => "-DB_ENDIAN -DMD32_REG_T=int -Wall", bn_ops => "BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR", - dso_scheme => "dlfcn", - shared_target => "bsd-gcc-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", }, + "BSD-ia64" => { - inherit_from => [ "ia64_asm" ], - cc => "gcc", - cflags => "-DL_ENDIAN -O3 -Wall", - thread_cflag => "${BSDthreads}", + inherit_from => [ "BSD-generic64", asm("ia64_asm") ], + cflags => "-DL_ENDIAN -Wall", bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT", - dso_scheme => "dlfcn", - shared_target => "bsd-gcc-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", }, + "BSD-x86_64" => { - inherit_from => [ "x86_64_asm" ], - cc => "gcc", - cflags => "-DL_ENDIAN -O3 -Wall", - thread_cflag => "${BSDthreads}", + inherit_from => [ "BSD-generic64", asm("x86_64_asm") ], + cflags => "-DL_ENDIAN -Wall", bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", perlasm_scheme => "elf", - dso_scheme => "dlfcn", - shared_target => "bsd-gcc-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", }, "bsdi-elf-gcc" => { - inherit_from => [ "x86_elf_asm" ], + inherit_from => [ asm("x86_elf_asm") ], cc => "gcc", cflags => "-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall", thread_cflag => "(unknown)", @@ -1248,7 +853,6 @@ bn_ops => "${x86_gcc_des} ${x86_gcc_opts}", }, "QNX6" => { - inherit_from => [ "no_asm_filler" ], cc => "gcc", lflags => "-lsocket", dso_scheme => "dlfcn", @@ -1257,7 +861,7 @@ shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", }, "QNX6-i386" => { - inherit_from => [ "x86_elf_asm" ], + inherit_from => [ asm("x86_elf_asm") ], cc => "gcc", cflags => "-DL_ENDIAN -O2 -Wall", lflags => "-lsocket", @@ -1295,7 +899,7 @@ bn_ops => "${x86_gcc_des} ${x86_gcc_opts}", }, "unixware-7" => { - inherit_from => [ "x86_elf_asm" ], + inherit_from => [ asm("x86_elf_asm") ], cc => "cc", cflags => "-O -DFILIO_H -Kalloca", thread_cflag => "-Kthread", @@ -1308,7 +912,7 @@ shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", }, "unixware-7-gcc" => { - inherit_from => [ "x86_elf_asm" ], + inherit_from => [ asm("x86_elf_asm") ], cc => "gcc", cflags => "-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=pentium -Wall", thread_cflag => "-D_REENTRANT", @@ -1322,7 +926,7 @@ }, # SCO 5 - Ben Laurie says the -O breaks the SCO cc. "sco5-cc" => { - inherit_from => [ "x86_elf_asm" ], + inherit_from => [ asm("x86_elf_asm") ], cc => "cc", cflags => "-belf", thread_cflag => "(unknown)", @@ -1335,7 +939,7 @@ shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", }, "sco5-gcc" => { - inherit_from => [ "x86_elf_asm" ], + inherit_from => [ asm("x86_elf_asm") ], cc => "gcc", cflags => "-O3 -fomit-frame-pointer", thread_cflag => "(unknown)", @@ -1349,17 +953,12 @@ }, #### IBM's AIX. - "aix3-cc" => { - cc => "cc", - cflags => "-O -DB_ENDIAN -qmaxmem=16384", - thread_cflag => "(unknown)", - sys_id => "AIX", - bn_ops => "BN_LLONG RC4_CHAR", - }, "aix-gcc" => { - inherit_from => [ "ppc32_asm" ], + inherit_from => [ asm("ppc32_asm") ], cc => "gcc", - cflags => "-O -DB_ENDIAN", + cflags => "-DB_ENDIAN", + debug_cflags => "-O0 -g", + release_cflags => "-O", thread_cflag => "-pthread", sys_id => "AIX", bn_ops => "BN_LLONG RC4_CHAR", @@ -1371,9 +970,11 @@ arflags => "-X32", }, "aix64-gcc" => { - inherit_from => [ "ppc64_asm" ], + inherit_from => [ asm("ppc64_asm") ], cc => "gcc", - cflags => "-maix64 -O -DB_ENDIAN", + cflags => "-maix64 -DB_ENDIAN", + debug_cflags => "-O0 -g", + release_cflags => "-O", thread_cflag => "-pthread", sys_id => "AIX", bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", @@ -1384,12 +985,15 @@ shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", arflags => "-X64", }, -# Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE -# at build time. $OBJECT_MODE is respected at ./config stage! + # Below targets assume AIX 5. Idea is to effectively disregard + # $OBJECT_MODE at build time. $OBJECT_MODE is respected at + # ./config stage! "aix-cc" => { - inherit_from => [ "ppc32_asm" ], + inherit_from => [ asm("ppc32_asm") ], cc => "cc", - cflags => "-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst", + cflags => "-q32 -DB_ENDIAN -qmaxmem=16384 -qro -qroconst", + debug_cflags => "", + release_cflags => "-O", thread_cflag => "-qthreaded -D_THREAD_SAFE", sys_id => "AIX", bn_ops => "BN_LLONG RC4_CHAR", @@ -1401,9 +1005,11 @@ arflags => "-X 32", }, "aix64-cc" => { - inherit_from => [ "ppc64_asm" ], + inherit_from => [ asm("ppc64_asm") ], cc => "cc", - cflags => "-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst", + cflags => "-q64 -DB_ENDIAN -qmaxmem=16384 -qro -qroconst", + debug_cflags => "", + release_cflags => "-O", thread_cflag => "-qthreaded -D_THREAD_SAFE", sys_id => "AIX", bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", @@ -1435,7 +1041,7 @@ bn_ops => "THIRTY_TWO_BIT DES_PTR DES_UNROLL MD2_CHAR RC4_INDEX RC4_CHAR BF_PTR", }, -# Visual C targets +#### Visual C targets # # Win64 targets, WIN64I denotes IA-64 and WIN64A - AMD64 # @@ -1443,79 +1049,59 @@ # positives in some situations. Disabling it altogether masks both # legitimate and false cases, but as we compile on multiple platforms, # we rely on other compilers to catch legitimate cases. - "VC-WIN64I" => { + "VC-common" => { + template => 1, cc => "cl", - cflags => "-W3 -wd4090 -Gs0 -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE", - sys_id => "WIN64I", - bn_ops => "SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN", - cpuid_obj => "ia64cpuid.o", - bn_obj => "ia64.o ia64-mont.o", - aes_obj => "aes_core.o aes_cbc.o aes-ia64.o", - md5_obj => "md5-ia64.o", - sha1_obj => "sha1-ia64.o sha256-ia64.o sha512-ia64.o", - modes_obj => "ghash-ia64.o", - perlasm_scheme => "ias", + cflags => "-W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE", dso_scheme => "win32", }, - "debug-VC-WIN64I" => { - cc => "cl", - cflags => "-W3 -wd4090 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE", + "VC-WIN64I" => { + inherit_from => [ "VC-common", asm("ia64_asm") ], + cflags => sub { join(" ",@_,"-DUNICODE -D_UNICODE"); }, sys_id => "WIN64I", bn_ops => "SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN", - cpuid_obj => "ia64cpuid.o", - bn_obj => "ia64.o", - aes_obj => "aes_core.o aes_cbc.o aes-ia64.o", - md5_obj => "md5-ia64.o", - sha1_obj => "sha1-ia64.o sha256-ia64.o sha512-ia64.o", - modes_obj => "ghash-ia64.o", + bn_obj => sub { my $r=join(" ",@_); $r=~s/bn\-//; $r; }, + rc4_obj => "", perlasm_scheme => "ias", - dso_scheme => "win32", }, "VC-WIN64A" => { - inherit_from => [ "win_x86_64_asm" ], - cc => "cl", - cflags => "-W3 -wd4090 -Gs0 -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE", - debug_cflags => "-Zi", + inherit_from => [ "VC-common", asm("x86_64_asm") ], + cflags => sub { join(" ",@_,"-DUNICODE -D_UNICODE"); }, sys_id => "WIN64A", bn_ops => "SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN", + bn_obj => sub { my $r=join(" ",@_); $r=~s/x86_64\-gcc/bn_asm/; $r; }, perlasm_scheme => "auto", - dso_scheme => "win32", }, -# x86 Win32 target defaults to ANSI API, if you want UNICODE, complement -# 'perl Configure VC-WIN32' with '-DUNICODE -D_UNICODE' "VC-WIN32" => { - inherit_from => [ "x86_asm" ], - cc => "cl", - cflags => "-W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE", - debug_cflags => "-Zi", + # x86 Win32 target defaults to ANSI API, if you want UNICODE, + # configure with 'perl Configure VC-WIN32 -DUNICODE -D_UNICODE' + inherit_from => [ "VC-common", asm("x86_asm") ], sys_id => "WIN32", bn_ops => "BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}", perlasm_scheme => "win32n", - dso_scheme => "win32", }, -# Unified CE target "VC-CE" => { - inherit_from => [ "no_asm_filler" ], cc => "cl", sys_id => "WINCE", bn_ops => "BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}", dso_scheme => "win32", }, -# Borland C++ 4.5 +#### Borland C++ 4.5 "BC-32" => { - inherit_from => [ "no_asm_filler" ], cc => "bcc32", sys_id => "WIN32", bn_ops => "BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN", dso_scheme => "win32", }, -# MinGW +#### MinGW "mingw" => { - inherit_from => [ "x86_asm" ], + inherit_from => [ asm("x86_asm") ], cc => "gcc", - cflags => "-mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -fomit-frame-pointer -O3 -march=i486 -Wall", + cflags => "-mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -march=i486 -Wall", + debug_cflags => "-g -O0", + release_clags => "-O3 -fomit-frame-pointer", thread_cflag => "-D_MT", sys_id => "MINGW32", lflags => "-lws2_32 -lgdi32 -lcrypt32", @@ -1527,17 +1113,20 @@ shared_ldflag => "-mno-cygwin", shared_extension => ".dll.a", }, -# As for OPENSSL_USE_APPLINK. Applink makes it possible to use .dll -# compiled with one compiler with application compiled with another -# compiler. It's possible to engage Applink support in mingw64 build, -# but it's not done, because till mingw64 supports structured exception -# handling, one can't seriously consider its binaries for using with -# non-mingw64 run-time environment. And as mingw64 is always consistent -# with itself, Applink is never engaged and can as well be omitted. "mingw64" => { - inherit_from => [ "x86_64_asm" ], - cc => "gcc", - cflags => "-mno-cygwin -DL_ENDIAN -O3 -Wall -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE", + # As for OPENSSL_USE_APPLINK. Applink makes it possible to use + # .dll compiled with one compiler with application compiled with + # another compiler. It's possible to engage Applink support in + # mingw64 build, but it's not done, because till mingw64 + # supports structured exception handling, one can't seriously + # consider its binaries for using with non-mingw64 run-time + # environment. And as mingw64 is always consistent with itself, + # Applink is never engaged and can as well be omitted. + inherit_from => [ asm("x86_64_asm") ], + cc => "gcc", + cflags => "-mno-cygwin -DL_ENDIAN -Wall -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE", + debug_cflags => "-g -O0", + release_clags => "-O3", thread_cflag => "-D_MT", sys_id => "MINGW64", lflags => "-lws2_32 -lgdi32 -lcrypt32", @@ -1550,9 +1139,8 @@ shared_extension => ".dll.a", }, -# UWIN +#### UWIN "UWIN" => { - inherit_from => [ "no_asm_filler" ], cc => "cc", cflags => "-DTERMIOS -DL_ENDIAN -O -Wall", sys_id => "UWIN", @@ -1560,11 +1148,13 @@ dso_scheme => "win32", }, -# Cygwin +#### Cygwin "Cygwin" => { - inherit_from => [ "x86_asm" ], + inherit_from => [ asm("x86_asm") ], cc => "gcc", - cflags => "-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall", + cflags => "-DTERMIOS -DL_ENDIAN -march=i486 -Wall", + debug_cflags => "-g -O0", + release_clags => "-O3 -fomit-frame-pointer", sys_id => "CYGWIN", bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", perlasm_scheme => "coff", @@ -1575,9 +1165,11 @@ shared_extension => ".dll.a", }, "Cygwin-x86_64" => { - inherit_from => [ "x86_64_asm" ], + inherit_from => [ asm("x86_64_asm") ], cc => "gcc", - cflags => "-DTERMIOS -DL_ENDIAN -O3 -Wall", + cflags => "-DTERMIOS -DL_ENDIAN -Wall", + debug_cflags => "-g -O0", + release_clags => "-O3", sys_id => "CYGWIN", bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", perlasm_scheme => "mingw64", @@ -1588,7 +1180,7 @@ shared_extension => ".dll.a", }, -# NetWare from David Ward (dsward@novell.com) +#### NetWare from David Ward (dsward@novell.com) # requires either MetroWerks NLM development tools, or gcc / nlmconv # NetWare defaults socket bio to WinSock sockets. However, # the builds can be configured to use BSD sockets instead. @@ -1611,7 +1203,7 @@ cflags => "-nostdinc -I/ndk/nwsdk/include/nlm -DNETWARE_BSDSOCK -DNETDB_USE_INTERNET -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYS_NETWARE -O2 -Wall", bn_ops => "${x86_gcc_opts}", }, -# netware-libc => LibC/NKS support + # netware-libc => LibC/NKS support "netware-libc" => { cc => "mwccnlm", bn_ops => "BN_LLONG ${x86_gcc_opts}", @@ -1631,9 +1223,9 @@ bn_ops => "BN_LLONG ${x86_gcc_opts}", }, -# DJGPP +#### DJGPP "DJGPP" => { - inherit_from => [ "x86_asm" ], + inherit_from => [ asm("x86_asm") ], cc => "gcc", cflags => "-I/dev/env/WATT_ROOT/inc -DTERMIO -DL_ENDIAN -fomit-frame-pointer -O2 -Wall", sys_id => "MSDOS", @@ -1642,7 +1234,7 @@ perlasm_scheme => "a.out", }, -# Ultrix from Bernhard Simon +#### Ultrix from Bernhard Simon "ultrix-cc" => { cc => "cc", cflags => "-std1 -O -Olimit 2500 -DL_ENDIAN", @@ -1658,11 +1250,11 @@ ##"ultrix","cc:-O2 -DNOPROTO -DNOCONST -DL_ENDIAN::(unknown):::::::", ##### MacOS X (a.k.a. Darwin) setup - "darwin-ppc-cc" => { - inherit_from => [ "ppc32_asm" ], + "darwin-common" => { + template => 1, cc => "cc", - cflags => "-arch ppc -DB_ENDIAN -Wa,-force_cpusubtype_ALL", - debug_cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g -Wall -O", + cflags => "", + debug_cflags => "-g -O0", release_cflags => "-O3", thread_cflag => "-D_REENTRANT", sys_id => "MACOSX", @@ -1672,59 +1264,39 @@ dso_scheme => "dlfcn", shared_target => "darwin-shared", shared_cflag => "-fPIC -fno-common", - shared_ldflag => "-arch ppc -dynamiclib", + shared_ldflag => "-dynamiclib", shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", }, + "darwin-ppc-cc" => { + inherit_from => [ "darwin-common", asm("ppc32_asm") ], + cflags => "-arch ppc -DB_ENDIAN -Wa,-force_cpusubtype_ALL", + perlasm_scheme => "osx32", + shared_ldflag => "-arch ppc -dynamiclib", + }, "darwin64-ppc-cc" => { - inherit_from => [ "ppc64_asm" ], - cc => "cc", - cflags => "-arch ppc64 -O3 -DB_ENDIAN", - thread_cflag => "-D_REENTRANT", - sys_id => "MACOSX", - lflags => "-Wl,-search_paths_first%", + inherit_from => [ "darwin-common", asm("ppc64_asm") ], + cflags => "-arch ppc64 -DB_ENDIAN", bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR", perlasm_scheme => "osx64", - dso_scheme => "dlfcn", - shared_target => "darwin-shared", - shared_cflag => "-fPIC -fno-common", shared_ldflag => "-arch ppc64 -dynamiclib", - shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", }, "darwin-i386-cc" => { - inherit_from => [ "x86_asm_nocast" ], - cc => "cc", + inherit_from => [ "darwin-common", asm("x86_asm") ], cflags => "-arch i386 -DL_ENDIAN", - debug_cflags => "-g3", release_cflags => "-O3 -fomit-frame-pointer", - thread_cflag => "-D_REENTRANT", - sys_id => "MACOSX", - lflags => "-Wl,-search_paths_first%", bn_ops => "BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR", perlasm_scheme => "macosx", - dso_scheme => "dlfcn", - shared_target => "darwin-shared", - shared_cflag => "-fPIC -fno-common", shared_ldflag => "-arch i386 -dynamiclib", - shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", }, "darwin64-x86_64-cc" => { - inherit_from => [ "x86_64_asm" ], - cc => "cc", + inherit_from => [ "darwin-common", asm("x86_64_asm") ], cflags => "-arch x86_64 -DL_ENDIAN -Wall", - debug_cflags => "-ggdb -g2 -O0", - release_cflags => "-O3", - thread_cflag => "-D_REENTRANT", - sys_id => "MACOSX", - lflags => "-Wl,-search_paths_first%", bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", perlasm_scheme => "macosx", - dso_scheme => "dlfcn", - shared_target => "darwin-shared", - shared_cflag => "-fPIC -fno-common", shared_ldflag => "-arch x86_64 -dynamiclib", - shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", }, -# iPhoneOS/iOS + +#### iPhoneOS/iOS # # It takes three prior-set environment variables to make it work: # @@ -1737,51 +1309,24 @@ # # CROSS_COMPILE=`xcode-select --print-path`/Toolchains/XcodeDefault.xctoolchain/usr/bin/ # CROSS_TOP=`xcode-select --print-path`/Platforms/iPhoneOS.platform/Developer -# CROSS_SDK=iPhoneOS7.0.sdk +# CROSS_SDK=iPhoneOS.sdk # "iphoneos-cross" => { - inherit_from => [ "no_asm_filler" ], - cc => "cc", - cflags => "-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common", - thread_cflag => "-D_REENTRANT", + inherit_from => [ "darwin-common" ], + cflags => "-isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common", sys_id => "iOS", - lflags => "-Wl,-search_paths_first%", - bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR", - dso_scheme => "dlfcn", - shared_target => "darwin-shared", - shared_cflag => "-fPIC -fno-common", - shared_ldflag => "-dynamiclib", - shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", }, "ios64-cross" => { - inherit_from => [ "aarch64_asm" ], - cc => "cc", - cflags => "-O3 -arch arm64 -mios-version-min=7.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common", - thread_cflag => "-D_REENTRANT", + inherit_from => [ "darwin-common", asm("aarch64_asm") ], + cflags => "-arch arm64 -mios-version-min=7.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common", sys_id => "iOS", - lflags => "-Wl,-search_paths_first%", bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR", perlasm_scheme => "ios64", - dso_scheme => "dlfcn", - shared_target => "darwin-shared", - shared_cflag => "-fPIC -fno-common", - shared_ldflag => "-dynamiclib", - shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - }, - -##### A/UX - "aux3-gcc" => { - cc => "gcc", - cflags => "-O2 -DTERMIO", - thread_cflag => "(unknown)", - sys_id => "AUX", - lflags => "-lbsd", - bn_ops => "RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR", }, ##### GNU Hurd "hurd-x86" => { - inherit_from => [ "x86_elf_asm" ], + inherit_from => [ asm("x86_elf_asm") ], cc => "gcc", cflags => "-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall", thread_cflag => "-D_REENTRANT", @@ -1835,7 +1380,6 @@ lflags => "-r", }, "vxworks-simlinux" => { - inherit_from => [ "no_asm_filler" ], cc => "ccpentium", cflags => "-B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\" -DL_ENDIAN -DCPU=SIMLINUX -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I\$(WIND_BASE)/target/h -I\$(WIND_BASE)/target/h/wrn/coreip -DOPENSSL_NO_HW_PADLOCK", sys_id => "VXWORKS", @@ -1843,7 +1387,7 @@ ranlib => "ranlibpentium", }, "vxworks-mips" => { - inherit_from => [ "mips32_asm" ], + inherit_from => [ asm("mips32_asm") ], cc => "ccmips", cflags => "-mrtp -mips2 -O -G 0 -B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\" -DCPU=MIPS32 -msoft-float -mno-branch-likely -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/h/wrn/coreip", thread_cflag => "-D_REENTRANT", @@ -1853,9 +1397,8 @@ ranlib => "ranlibmips", }, -# uClinux +#### uClinux "uClinux-dist" => { - inherit_from => [ "no_asm_filler" ], cc => "$ENV{'CC'}", cflags => "\$(CFLAGS)", thread_cflag => "-D_REENTRANT", @@ -1869,7 +1412,6 @@ ranlib => "$ENV{'RANLIB'}", }, "uClinux-dist64" => { - inherit_from => [ "no_asm_filler" ], cc => "$ENV{'CC'}", cflags => "\$(CFLAGS)", thread_cflag => "-D_REENTRANT", diff --git a/Configure b/Configure index 4a34b4e9c8..c038f85594 100755 --- a/Configure +++ b/Configure @@ -166,7 +166,6 @@ my $ppc32_asm=$ppc64_asm; # seems to be sufficient? my $BSDthreads="-pthread -D_THREAD_SAFE -D_REENTRANT"; - # table of known configurations, read in from files # # The content of each entry can take one of two forms: @@ -349,29 +348,7 @@ my %table=( # Note: as long as someone might use old style configuration strings, # or we bother supporting that, those variables need to stay - # Filler used for when there are no asm files. - no_asm_filler => { - template => 1, - cpuid_obj => "", - bn_obj => "", - ec_obj => "", - des_obj => "", - aes_obj => "", - bf_obj => "", - md5_obj => "", - sha1_obj => "", - cast_obj => "", - rc4_obj => "", - rmd160_obj => "", - rc5_obj => "", - wp_obj => "", - cmll_obj => "", - modes_obj => "", - engines_obj => "", - perlasm_scheme => "void" - }, - - x86_asm_nocast => { + x86_asm => { template => 1, cpuid_obj => "x86cpuid.o", bn_obj => "bn-586.o co-586.o x86-mont.o x86-gf2m.o", @@ -389,26 +366,15 @@ my %table=( modes_obj => "ghash-x86.o", engines_obj => "e_padlock-x86.o" }, - x86_asm => { - template => 1, - inherit_from => [ "x86_asm_nocast" ], - cast_obj => "cast-586.o", - }, x86_elf_asm => { template => 1, inherit_from => [ "x86_asm" ], perlasm_scheme => "elf" }, - android_x86_elf_asm => { - template => 1, - inherit_from => [ "x86_asm" ], - perlasm_scheme => "android" - }, - - _x86_64_asm => { + x86_64_asm => { template => 1, cpuid_obj => "x86_64cpuid.o", - bn_obj => "x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o", + bn_obj => "x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o", ec_obj => "ecp_nistz256.o ecp_nistz256-x86_64.o", aes_obj => "aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o", md5_obj => "md5-x86_64.o", @@ -419,16 +385,6 @@ my %table=( modes_obj => "ghash-x86_64.o aesni-gcm-x86_64.o", engines_obj => "e_padlock-x86_64.o" }, - x86_64_asm => { - inherit_from => [ "_x86_64_asm" ], - template => 1, - bn_obj => sub { join(" ","x86_64-gcc.o",@_) } - }, - win_x86_64_asm => { - inherit_from => [ "_x86_64_asm" ], - template => 1, - bn_obj => sub { join(" ","bn_asm.o",@_) } - }, ia64_asm => { template => 1, cpuid_obj => "ia64cpuid.o", @@ -478,25 +434,15 @@ my %table=( template => 1, sha1_obj => sub { join(" ", @_, "sha512-mips.o") } }, - _s390x_asm => { + s390x_asm => { template => 1, cpuid_obj => "s390xcap.o s390xcpuid.o", - bn_obj => "s390x-mont.o s390x-gf2m.o", + bn_obj => "bn-s390x.o s390x-mont.o s390x-gf2m.o", aes_obj => "aes-s390x.o aes-ctr.o aes-xts.o", sha1_obj => "sha1-s390x.o sha256-s390x.o sha512-s390x.o", rc4_obj => "rc4-s390x.o", modes_obj => "ghash-s390x.o", }, - s390x_asm => { - template => 1, - inherit_from => [ "_s390x_asm" ], - bn_obj => sub { join(" ", "bn-s390x.o", @_) } - }, - s390x_32_asm => { - template => 1, - inherit_from => [ "_s390x_asm" ], - bn_obj => sub { join(" ", "bn_asm.o", @_) } - }, armv4_asm => { template => 1, cpuid_obj => "armcap.o armv4cpuid.o", @@ -524,26 +470,10 @@ my %table=( modes_obj => "ghash-parisc.o", perlasm_scheme => "32" }, - _parisc20_asm => { - template => 1, - cpuid_obj => "pariscid.o", - bn_obj => "parisc-mont.o", - aes_obj => "aes_core.o aes_cbc.o aes-parisc.o", - sha1_obj => "sha1-parisc.o sha256-parisc.o sha512-parisc.o", - rc4_obj => "rc4-parisc.o", - modes_obj => "ghash-parisc.o", - perlasm_scheme => "64" - }, - parisc20_32_asm => { - template => 1, - inherit_from => [ "_parisc20_asm" ], - bn_obj => sub { join(" ", "pa-risc2.o", @_) }, - perlasm_scheme => "32", - }, parisc20_64_asm => { template => 1, - inherit_from => [ "_parisc20_asm" ], - bn_obj => sub { join(" ", "pa-risc2W.o", @_) }, + inherit_from => [ "parisc11_asm" ], + bn_obj => sub { my $r=join(" ",@_); $r=~s/bn_asm/pa-risc2W/; $r; }, perlasm_scheme => "64", }, ppc64_asm => { @@ -560,6 +490,12 @@ my %table=( }, ); +{ my $no_asm_templates=0; + foreach (@ARGV) { $no_asm_templates=1 if (/^\-?no\-asm$/); } + sub asm { $no_asm_templates?():@_; } +} + + sub stringtohash { my $in = shift @_; if (ref($in) eq "HASH") { -- 2.25.1