diff options
| author | Rich Salz <rsalz@akamai.com> | 2021-05-19 11:09:49 -0400 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-05-28 10:04:31 +0200 |
| commit | a935791d54078f43209ffbc1886ac5e68772ce34 (patch) | |
| tree | 3f130fe3e12b6671584ff421984542579d5268a8 /Configurations | |
| parent | 6bf3692d311ad15d3667e7015bbe1a8f849f3c7b (diff) | |
Rework and make DEBUG macros consistent.
Remove unused -DCONF_DEBUG and -DBN_CTX_DEBUG.
Rename REF_PRINT to REF_DEBUG for consistency, and add a new
tracing category and use it for printing reference counts.
Rename -DDEBUG_UNUSED to -DUNUSED_RESULT_DEBUG
Fix BN_DEBUG_RAND so it compiles and, when set, force DEBUG_RAND to
be set also.
Rename engine_debug_ref to be ENGINE_REF_PRINT also for consistency.
Fixes #15357
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15353)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/90-team.norelease.conf | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Configurations/90-team.norelease.conf b/Configurations/90-team.norelease.conf index 8ad05a6cc6..c0a14328c6 100644 --- a/Configurations/90-team.norelease.conf +++ b/Configurations/90-team.norelease.conf @@ -12,14 +12,17 @@ my %targets = ( "debug" => { inherit_from => [ 'BASE_unix' ], cc => "gcc", - cflags => "-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DOPENSSL_NO_ASM -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror", + cflags => combine(join(' ', @gcc_devteam_warn), + "-DOPENSSL_NO_ASM -ggdb -g2" + . " -DBN_DEBUG -DBN_RAND_DEBUG" + ), thread_scheme => "(unknown)", }, "debug-erbridge" => { inherit_from => [ 'BASE_unix', "x86_64_asm" ], cc => "gcc", cflags => combine(join(' ', @gcc_devteam_warn), - "-DBN_DEBUG -DCONF_DEBUG -m64 -DL_ENDIAN -DTERMIO -g", + "-m64 -DL_ENDIAN -DTERMIO -g", threads("-D_REENTRANT")), ex_libs => add(" ","-ldl"), bn_ops => "SIXTY_FOUR_BIT_LONG", @@ -35,7 +38,7 @@ my %targets = ( "debug-linux-pentium" => { inherit_from => [ 'BASE_unix', "x86_elf_asm" ], cc => "gcc", - cflags => combine("-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -mcpu=pentium -Wall", + cflags => combine("-DL_ENDIAN -g -mcpu=pentium -Wall", threads("-D_REENTRANT")), ex_libs => add(" ","-ldl"), bn_ops => "BN_LLONG", @@ -47,7 +50,7 @@ my %targets = ( "debug-linux-ppro" => { inherit_from => [ 'BASE_unix', "x86_elf_asm" ], cc => "gcc", - cflags => combine("-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -mcpu=pentiumpro -Wall", + cflags => combine("-DL_ENDIAN -g -mcpu=pentiumpro -Wall", threads("-D_REENTRANT")), ex_libs => add(" ","-ldl"), bn_ops => "BN_LLONG", @@ -60,7 +63,7 @@ my %targets = ( inherit_from => [ 'BASE_unix', "x86_64_asm" ], cc => "clang", cflags => combine(join(' ', @gcc_devteam_warn), - "-Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_UNUSED -g3 -O3 -pipe", + "-Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -g3 -O3 -pipe", threads("${BSDthreads}")), bn_ops => "SIXTY_FOUR_BIT_LONG", thread_scheme => "pthreads", @@ -75,7 +78,7 @@ my %targets = ( cc => "clang", cflags => combine("-arch x86_64 -DL_ENDIAN", join(' ', @gcc_devteam_warn), - "-Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_UNUSED -g3 -O3 -pipe", + "-Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -g3 -O3 -pipe", threads("${BSDthreads}")), sys_id => "MACOSX", bn_ops => "SIXTY_FOUR_BIT_LONG", |