X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=Configurations%2F10-main.conf;h=b1528c1cafaf73e7dbae13b2d6ba4904d9bfdaa6;hp=aa4c76acfab414258a12150a9732c548f71cec19;hb=a717c110d25e3e3e197f6b8a9228f2601ca9c9af;hpb=13efe9d17e7ee522c5aaa07f3076184161ede61f diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index aa4c76acfa..b1528c1caf 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1,7 +1,8 @@ +## -*- mode: perl; -*- ## Standard openssl configuration targets. ## ## If you edit this file, run this command before committing -## make -f Makefile.org TABLE +## make -f Makefile.in TABLE ## This file is interpolated by the Configure script. %targets = ( @@ -25,7 +26,7 @@ "vos-gcc" => { 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", + debug_cflags => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG", release_cflags => "-O3", thread_cflag => "(unknown)", sys_id => "VOS", @@ -34,6 +35,15 @@ shared_extension => ".so", }, +#### Solaros configirations + "solaris-common" => { + template => 1, + cflags => "-DFILIO_H", + lflags => "-lsocket -lnsl -ldl", + dso_scheme => "dlfcn", + shared_target => "solaris-shared", + shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + }, #### Solaris x86 with GNU C setups "solaris-x86-gcc" => { # -DOPENSSL_NO_INLINE_ASM switches off inline assembler. We have @@ -41,19 +51,15 @@ # 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") ], + inherit_from => [ "solaris-common", asm("x86_elf_asm") ], cc => "gcc", - cflags => "-march=pentium -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM", + cflags => sub { join(" ","-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", + thread_cflag => "-pthread", bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", - dso_scheme => "dlfcn", - shared_target => "solaris-shared", shared_cflag => "-fPIC", shared_ldflag => "-shared", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", }, "solaris64-x86_64-gcc" => { # -shared -static-libgcc might appear controversial, but modules @@ -64,88 +70,73 @@ # 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") ], + inherit_from => [ "solaris-common", asm("x86_64_asm") ], cc => "gcc", - cflags => "-m64 -Wall -DL_ENDIAN", + cflags => sub { join(" ","-m64 -Wall -DL_ENDIAN",@_) }, debug_cflags => "-O0 -g", release_cflags => "-O3", - thread_cflag => "-D_REENTRANT", - lflags => "-lsocket -lnsl -ldl", + thread_cflag => "-pthread", bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", perlasm_scheme => "elf", - dso_scheme => "dlfcn", - shared_target => "solaris-shared", shared_cflag => "-fPIC", shared_ldflag => "-m64 -shared -static-libgcc", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", multilib => "/64", }, #### Solaris x86 with Sun C setups "solaris-x86-cc" => { + inherit_from => [ "solaris-common" ], cc => "cc", - cflags => "-xarch=generic -xstrconst -Xa -DL_ENDIAN", + cflags => sub { join(" ","-xarch=generic -xstrconst -Xa -DL_ENDIAN",@_) }, debug_cflags => "-g", release_cflags => "-xO5 -xregs=frameptr -xdepend -xbuiltin", thread_cflag => "-D_REENTRANT", - lflags => "-lsocket -lnsl -ldl", + lflags => sub { join(" ",@_,"-mt -lpthread") }, bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR 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)", }, "solaris64-x86_64-cc" => { - inherit_from => [ asm("x86_64_asm") ], + inherit_from => [ "solaris-common", asm("x86_64_asm") ], cc => "cc", - cflags => "-xarch=generic64 -xstrconst -Xa -DL_ENDIAN", + cflags => sub { join(" ","-xarch=generic64 -xstrconst -Xa -DL_ENDIAN",@_) }, debug_cflags => "-g", release_cflags => "-xO5 -xdepend -xbuiltin", thread_cflag => "-D_REENTRANT", - lflags => "-lsocket -lnsl -ldl", + lflags => sub { join(" ",@_,"-mt -lpthread") }, bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", perlasm_scheme => "elf", - dso_scheme => "dlfcn", - shared_target => "solaris-shared", shared_cflag => "-KPIC", 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 => [ "solaris-common" ], cc => "gcc", - cflags => "-Wall -DB_ENDIAN -DBN_DIV2W", + cflags => sub { join(" ","-Wall -DB_ENDIAN -DBN_DIV2W",@_) }, debug_cflags => "-O0 -g", release_cflags => "-O3", - thread_cflag => "-D_REENTRANT", - lflags => "-lsocket -lnsl -ldl", + thread_cflag => "-pthread", 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)", }, "solaris-sparcv8-gcc" => { inherit_from => [ "solaris-sparcv7-gcc", asm("sparcv8_asm") ], - cflags => sub { join(" ","-mv8",@_); }, + cflags => sub { join(" ","-mcpu=v8",@_); }, }, "solaris-sparcv9-gcc" => { # -m32 should be safe to add as long as driver recognizes - # -mcpu=ultrasparc + # -mcpu=ultrasparc inherit_from => [ "solaris-sparcv7-gcc", asm("sparcv9_asm") ], - cc => "gcc", 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", + debug_cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DPEDANTIC -O -g -pedantic -ansi -Wshadow -Wno-long-long -D__EXTENSIONS__", }, "solaris64-sparcv9-gcc" => { inherit_from => [ "solaris-sparcv9-gcc" ], - cc => "gcc", - cflags => "-m64 -mcpu=ultrasparc -Wall -DB_ENDIAN", + cflags => sub { my $f=join(" ",@_); $f =~ s/\-m32/-m64/; $f; }, bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR", shared_ldflag => "-m64 -shared", multilib => "/64", @@ -156,18 +147,16 @@ # 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 => [ "solaris-common" ], cc => "cc", - cflags => "-xstrconst -Xa -DB_ENDIAN -DBN_DIV2W", - debug_cflags => "-g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL", + cflags => sub { join(" ","-xstrconst -Xa -DB_ENDIAN -DBN_DIV2W",@_) }, + debug_cflags => "-g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG", release_cflags => "-xO5 -xdepend", thread_cflag => "-D_REENTRANT", - lflags => "-lsocket -lnsl -ldl", + lflags => sub { join(" ",@_,"-mt -lpthread") }, 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)", }, #### "solaris-sparcv8-cc" => { @@ -223,7 +212,7 @@ cflags => "-mabi=n32 -DB_ENDIAN -DBN_DIV3W", debug_cflags => "-g -O0", release_cflags => "-O3", - thread_cflag => "-D_SGI_MP_SOURCE", + thread_cflag => "-D_SGI_MP_SOURCE -pthread", 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", dso_scheme => "dlfcn", @@ -239,6 +228,7 @@ debug_cflags => "-g -O0", release_cflags => "-O2", thread_cflag => "-D_SGI_MP_SOURCE", + lflags => "-lpthread", bn_ops => "DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT", perlasm_scheme => "n32", dso_scheme => "dlfcn", @@ -270,6 +260,7 @@ debug_cflags => "-g -O0", release_cflags => "-O2", thread_cflag => "-D_SGI_MP_SOURCE", + lflags => "-lpthread", bn_ops => "RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG", perlasm_scheme => "64", dso_scheme => "dlfcn", @@ -312,7 +303,7 @@ cflags => "-DB_ENDIAN -DBN_DIV2W", debug_cflags => "-O0 -g", release_cflags => "-O3", - thread_cflag => "-D_REENTRANT", + thread_cflag => "-pthread", lflags => "-Wl,+s -ldld", bn_ops => "BN_LLONG DES_PTR DES_UNROLL DES_RISC1", dso_scheme => "dl", @@ -352,7 +343,7 @@ debug_cflags => "+O0 +d -g", release_cflags => "+O3", thread_cflag => "-D_REENTRANT", - lflags => "-Wl,+s -ldld", + lflags => "-Wl,+s -ldld -lpthread", bn_ops => "MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT", dso_scheme => "dl", shared_target => "hpux-shared", @@ -372,7 +363,7 @@ debug_cflags => "+O0 +d -g", release_cflags => "+O3", thread_cflag => "-D_REENTRANT", - lflags => "-ldl", + lflags => "-ldl -lpthread", bn_ops => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT", dso_scheme => "dlfcn", shared_target => "hpux-shared", @@ -390,7 +381,7 @@ debug_cflags => "+O0 +d -g", release_cflags => "+O2", thread_cflag => "-D_REENTRANT", - lflags => "-ldl", + lflags => "-ldl -lpthread", bn_ops => "SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT", dso_scheme => "dlfcn", shared_target => "hpux-shared", @@ -408,7 +399,7 @@ debug_cflags => "+O0 +d -g", release_cflags => "+O3", thread_cflag => "-D_REENTRANT", - lflags => "-ldl", + lflags => "-ldl -lpthread", bn_ops => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT", dso_scheme => "dlfcn", shared_target => "hpux-shared", @@ -424,7 +415,7 @@ cflags => "-DB_ENDIAN", debug_cflags => "-O0 -g", release_cflags => "-O3", - thread_cflag => "-D_REENTRANT", + thread_cflag => "-pthread", lflags => "-ldl", bn_ops => "SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT", dso_scheme => "dlfcn", @@ -440,7 +431,7 @@ cflags => "-mlp64 -DB_ENDIAN", debug_cflags => "-O0 -g", release_cflags => "-O3", - thread_cflag => "-D_REENTRANT", + thread_cflag => "-pthread", lflags => "-ldl", bn_ops => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT", dso_scheme => "dlfcn", @@ -510,9 +501,9 @@ "linux-generic32" => { cc => "gcc", cflags => "-Wall", - debug_cflags => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG", + debug_cflags => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG", release_cflags => "-O3", - thread_cflag => "-D_REENTRANT", + thread_cflag => "-pthread", lflags => "-ldl", bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR", dso_scheme => "dlfcn", @@ -582,6 +573,13 @@ inherit_from => [ "linux-generic64", asm("aarch64_asm") ], perlasm_scheme => "linux64", }, + "linux-arm64ilp32" => { # https://wiki.linaro.org/Platform/arm64-ilp32 + inherit_from => [ "linux-generic32", asm("aarch64_asm") ], + cflags => "-mabi=ilp32 -Wall", + bn_ops => "SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR", + perlasm_scheme => "linux64", + shared_ldflag => "-mabi=ilp32", + }, "linux-mips32" => { # Configure script adds minimally required -march for assembly @@ -614,7 +612,7 @@ inherit_from => [ "linux-generic32", asm("x86_elf_asm") ], cc => "gcc", cflags => "-march=i486 -DL_ENDIAN -Wall", - debug_cflags => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG", + debug_cflags => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG", release_cflags => "-O3 -fomit-frame-pointer", debug_lflags => "-lefence", bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", @@ -641,14 +639,7 @@ "linux-x86_64-clang" => { inherit_from => [ "linux-x86_64" ], cc => "clang", - # TODO(openssl-team): fix problems and investigate if (at least) the - # following warnings can also be enabled: - # -Wconditional-uninitialized, -Wswitch-enum, -Wunused-macros, - # -Wmissing-field-initializers, -Wmissing-variable-declarations, - # -Wincompatible-pointer-types-discards-qualifiers, -Wcast-align, - # -Wunreachable-code -Wunused-parameter -Wlanguage-extension-token - # -Wextended-offsetof - cflags => "-m64 -DL_ENDIAN -Wall -Wextra $clang_disabled_warnings -Qunused-arguments", + cflags => "-m64 -DL_ENDIAN -Wall -Wextra -Qunused-arguments", }, "linux-x32" => { inherit_from => [ "linux-generic32", asm("x86_64_asm") ], @@ -667,7 +658,6 @@ "linux64-s390x" => { inherit_from => [ "linux-generic64", asm("s390x_asm") ], cflags => "-m64 -Wall -DB_ENDIAN", - thread_cflag => "-D_REENTRANT", perlasm_scheme => "64", shared_ldflag => "-m64", multilib => "64", @@ -702,7 +692,7 @@ # patiently assisted with debugging of following two configs. "linux-sparcv8" => { inherit_from => [ "linux-generic32", asm("sparcv8_asm") ], - cflags => "-mv8 -Wall -DB_ENDIAN -DBN_DIV2W", + cflags => "-mcpu=v8 -Wall -DB_ENDIAN -DBN_DIV2W", }, "linux-sparcv9" => { # it's a real mess with -mcpu=ultrasparc option under Linux, @@ -816,6 +806,18 @@ perlasm_scheme => "o32", }, + "android64" => { + inherit_from => [ "linux-generic64" ], + cflags => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack -Wall", + debug_cflags => "-O0 -g", + lflags => "-pie%-ldl", + shared_cflag => "", + }, + "android64-aarch64" => { + inherit_from => [ "android64", asm("aarch64_asm") ], + perlasm_scheme => "linux64", + }, + #### *BSD "BSD-generic32" => { # As for thread_cflag. Idea is to maintain "collective" set of @@ -825,7 +827,7 @@ # expands it as -lc_r, which has to be accompanied by explicit # -D_THREAD_SAFE and sometimes -D_REENTRANT. FreeBSD 5.x # expands it as -lc_r, which seems to be sufficient? - cc => "gcc", + cc => "cc", cflags => "-Wall", debug_cflags => "-O0 -g", release_cflags => "-O3", @@ -856,7 +858,7 @@ "BSD-sparcv8" => { inherit_from => [ "BSD-generic32", asm("sparcv8_asm") ], - cflags => "-mv8 -Wall -DB_ENDIAN", + cflags => "-mcpu=v8 -Wall -DB_ENDIAN", }, "BSD-sparc64" => { # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it @@ -1164,7 +1166,7 @@ cc => "gcc", cflags => "-mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -march=i486 -Wall", debug_cflags => "-g -O0", - release_clags => "-O3 -fomit-frame-pointer", + release_cflags => "-O3 -fomit-frame-pointer", thread_cflag => "-D_MT", sys_id => "MINGW32", lflags => "-lws2_32 -lgdi32 -lcrypt32", @@ -1189,7 +1191,7 @@ cc => "gcc", cflags => "-mno-cygwin -DL_ENDIAN -Wall -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE", debug_cflags => "-g -O0", - release_clags => "-O3", + release_cflags => "-O3", thread_cflag => "-D_MT", sys_id => "MINGW64", lflags => "-lws2_32 -lgdi32 -lcrypt32", @@ -1202,6 +1204,13 @@ shared_extension => ".dll.a", }, +#### UEFI + "UEFI" => { + cc => "cc", + cflags => "-DL_ENDIAN -O", + sys_id => "UEFI", + }, + #### UWIN "UWIN" => { cc => "cc", @@ -1212,12 +1221,12 @@ }, #### Cygwin - "Cygwin" => { + "Cygwin-i686" => { inherit_from => [ asm("x86_asm") ], cc => "gcc", - cflags => "-DTERMIOS -DL_ENDIAN -march=i486 -Wall", + cflags => "-DTERMIOS -DL_ENDIAN -Wall", debug_cflags => "-g -O0", - release_clags => "-O3 -fomit-frame-pointer", + release_cflags => "-O3 -fomit-frame-pointer", sys_id => "CYGWIN", bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", perlasm_scheme => "coff", @@ -1232,7 +1241,7 @@ cc => "gcc", cflags => "-DTERMIOS -DL_ENDIAN -Wall", debug_cflags => "-g -O0", - release_clags => "-O3", + release_cflags => "-O3", sys_id => "CYGWIN", bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", perlasm_scheme => "mingw64", @@ -1379,6 +1388,15 @@ cflags => "-isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common", sys_id => "iOS", }, + "ios-cross" => { + inherit_from => [ "darwin-common", asm("armv4_asm") ], + # It should be possible to go below iOS 6 and even add -arch armv6, + # thus targeting iPhone pre-3GS, but it's assumed to be irrelevant + # at this point. + cflags => "-arch armv7 -mios-version-min=6.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common", + sys_id => "iOS", + perlasm_scheme => "ios32", + }, "ios64-cross" => { inherit_from => [ "darwin-common", asm("aarch64_asm") ], cflags => "-arch arm64 -mios-version-min=7.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common", @@ -1392,7 +1410,7 @@ inherit_from => [ asm("x86_elf_asm") ], cc => "gcc", cflags => "-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall", - thread_cflag => "-D_REENTRANT", + thread_cflag => "-pthread", lflags => "-ldl", bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", dso_scheme => "dlfcn", @@ -1432,7 +1450,7 @@ }, "vxworks-ppc750-debug" => { cc => "ccppc", - cflags => "-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG -g", + cflags => "-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG -g", sys_id => "VXWORKS", lflags => "-r", },