Find debug- targets that can be combined with their non-debug counterparts and do so
Reviewed-by: Andy Polyakov <appro@openssl.org>
This commit is contained in:
Richard Levitte
parent
5e1b23536a
commit
7910044064
2 changed files with 23 additions and 96 deletions
|
|
@ -4,9 +4,6 @@
|
|||
## make -f Makefile.org TABLE
|
||||
## This file is interpolated by the Configure script.
|
||||
|
||||
# Filler used for when there are no asm files.
|
||||
my $no_asm_filler="::::::::::::::::void";
|
||||
|
||||
%targets = (
|
||||
|
||||
# Basic configs that should work on any (32 and less bit) box
|
||||
|
|
@ -143,9 +140,9 @@ my $no_asm_filler="::::::::::::::::void";
|
|||
"solaris-sparcv9-gcc" => {
|
||||
inherit_from => [ "sparcv9_asm" ],
|
||||
cc => "gcc",
|
||||
cflags => "-mcpu=ultrasparc -Wall -DB_ENDIAN -DBN_DIV2W",
|
||||
cflags => "-m32 -mcpu=ultrasparc -Wall -DB_ENDIAN -DBN_DIV2W",
|
||||
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 => "-m32 -O3 -fomit-frame-pointer",
|
||||
release_cflags => "-O3 -fomit-frame-pointer",
|
||||
thread_cflag => "-D_REENTRANT",
|
||||
sys_id => "ULTRASPARC",
|
||||
lflags => "-lsocket -lnsl -ldl",
|
||||
|
|
@ -617,7 +614,9 @@ my $no_asm_filler="::::::::::::::::void";
|
|||
"linux-generic32" => {
|
||||
inherit_from => [ "no_asm_filler" ],
|
||||
cc => "gcc",
|
||||
cflags => "-O3 -fomit-frame-pointer -Wall",
|
||||
cflags => "-Wall",
|
||||
debug_cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g",
|
||||
release_cflags => "-O3 -fomit-frame-pointer",
|
||||
thread_cflag => "-D_REENTRANT",
|
||||
lflags => "-ldl",
|
||||
bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
|
||||
|
|
@ -755,9 +754,12 @@ my $no_asm_filler="::::::::::::::::void";
|
|||
"linux-elf" => {
|
||||
inherit_from => [ "x86_elf_asm" ],
|
||||
cc => "gcc",
|
||||
cflags => "-DL_ENDIAN -O3 -fomit-frame-pointer -Wall",
|
||||
cflags => "-DL_ENDIAN -Wall",
|
||||
debug_cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -g -march=i486",
|
||||
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",
|
||||
|
|
@ -776,7 +778,9 @@ my $no_asm_filler="::::::::::::::::void";
|
|||
"linux-generic64" => {
|
||||
inherit_from => [ "no_asm_filler" ],
|
||||
cc => "gcc",
|
||||
cflags => "-O3 -Wall",
|
||||
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",
|
||||
|
|
@ -841,7 +845,9 @@ my $no_asm_filler="::::::::::::::::void";
|
|||
"linux-x86_64" => {
|
||||
inherit_from => [ "x86_64_asm" ],
|
||||
cc => "gcc",
|
||||
cflags => "-m64 -DL_ENDIAN -O3 -Wall",
|
||||
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",
|
||||
|
|
@ -1135,9 +1141,9 @@ my $no_asm_filler="::::::::::::::::void";
|
|||
"BSD-x86-elf" => {
|
||||
inherit_from => [ "x86_elf_asm" ],
|
||||
cc => "gcc",
|
||||
cflags => "-DL_ENDIAN -O3 -Wall",
|
||||
cflags => "-DL_ENDIAN -Wall",
|
||||
debug_cflags => "-g",
|
||||
release_cflags => "-fomit-frame-pointer",
|
||||
release_cflags => "-O3 -fomit-frame-pointer",
|
||||
thread_cflag => "${BSDthreads}",
|
||||
bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
|
||||
dso_scheme => "dlfcn",
|
||||
|
|
@ -1655,7 +1661,9 @@ my $no_asm_filler="::::::::::::::::void";
|
|||
"darwin-ppc-cc" => {
|
||||
inherit_from => [ "ppc32_asm" ],
|
||||
cc => "cc",
|
||||
cflags => "-arch ppc -O3 -DB_ENDIAN -Wa,-force_cpusubtype_ALL",
|
||||
cflags => "-arch ppc -DB_ENDIAN -Wa,-force_cpusubtype_ALL",
|
||||
debug_cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g -Wall -O",
|
||||
release_cflags => "-O3",
|
||||
thread_cflag => "-D_REENTRANT",
|
||||
sys_id => "MACOSX",
|
||||
lflags => "-Wl,-search_paths_first%",
|
||||
|
|
@ -1667,20 +1675,6 @@ my $no_asm_filler="::::::::::::::::void";
|
|||
shared_ldflag => "-arch ppc -dynamiclib",
|
||||
shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
||||
},
|
||||
"debug-darwin-ppc-cc" => {
|
||||
inherit_from => [ "ppc32_asm" ],
|
||||
cc => "cc",
|
||||
cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O",
|
||||
thread_cflag => "-D_REENTRANT",
|
||||
sys_id => "MACOSX",
|
||||
bn_ops => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",
|
||||
perlasm_scheme => "osx32",
|
||||
dso_scheme => "dlfcn",
|
||||
shared_target => "darwin-shared",
|
||||
shared_cflag => "-fPIC",
|
||||
shared_ldflag => "-dynamiclib",
|
||||
shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
||||
},
|
||||
"darwin64-ppc-cc" => {
|
||||
inherit_from => [ "ppc64_asm" ],
|
||||
cc => "cc",
|
||||
|
|
@ -1699,22 +1693,9 @@ my $no_asm_filler="::::::::::::::::void";
|
|||
"darwin-i386-cc" => {
|
||||
inherit_from => [ "x86_asm_nocast" ],
|
||||
cc => "cc",
|
||||
cflags => "-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN",
|
||||
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",
|
||||
},
|
||||
"debug-darwin-i386-cc" => {
|
||||
inherit_from => [ "x86_asm" ],
|
||||
cc => "cc",
|
||||
cflags => "-arch i386 -g3 -DL_ENDIAN",
|
||||
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%",
|
||||
|
|
|
|||
|
|
@ -4,9 +4,6 @@
|
|||
## make -f Makefile.org TABLE
|
||||
## This file is interpolated by the Configure script.
|
||||
|
||||
# Filler used for when there are no asm files.
|
||||
my $no_asm_filler="::::::::::::::::void";
|
||||
|
||||
%targets = (
|
||||
"purify" => {
|
||||
cc => "purify gcc",
|
||||
|
|
@ -267,18 +264,6 @@ my $no_asm_filler="::::::::::::::::void";
|
|||
bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
|
||||
dso_scheme => "dlfcn",
|
||||
},
|
||||
"debug-linux-elf" => {
|
||||
inherit_from => [ "x86_elf_asm" ],
|
||||
cc => "gcc",
|
||||
cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -march=i486 -Wall",
|
||||
thread_cflag => "-D_REENTRANT",
|
||||
lflags => "-lefence -ldl",
|
||||
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)",
|
||||
},
|
||||
"debug-linux-elf-noefence" => {
|
||||
inherit_from => [ "x86_elf_asm" ],
|
||||
cc => "gcc",
|
||||
|
|
@ -317,45 +302,6 @@ my $no_asm_filler="::::::::::::::::void";
|
|||
shared_cflag => "-fPIC",
|
||||
shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
||||
},
|
||||
"debug-linux-generic32" => {
|
||||
inherit_from => [ "no_asm_filler" ],
|
||||
cc => "gcc",
|
||||
cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g -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)",
|
||||
},
|
||||
"debug-linux-generic64" => {
|
||||
inherit_from => [ "no_asm_filler" ],
|
||||
cc => "gcc",
|
||||
cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g -Wall",
|
||||
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)",
|
||||
},
|
||||
"debug-linux-x86_64" => {
|
||||
inherit_from => [ "x86_64_asm" ],
|
||||
cc => "gcc",
|
||||
cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -g -Wall",
|
||||
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",
|
||||
},
|
||||
"dist" => {
|
||||
cc => "cc",
|
||||
cflags => "-O",
|
||||
|
|
|
|||
Loading…
Reference in a new issue