Commit 463a7b8c authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Clean-up *_DEBUG options. 



Since NDEBUG is defined unconditionally on command line for release
builds, we can omit *_DEBUG options in favour of effective "all-on"
in debug builds exercised though CI.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarEmilia Käsper <emilia@openssl.org>
parent c32cbe97

Configurations/10-main.conf

+5 −6
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ sub vms_info { 
        inherit_from     => [ "BASE_unix" ],

        cc               => "gcc",

        cflags           => picker(default => "-Wall -DOPENSSL_SYS_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN",

                                   debug   => "-O0 -g -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG",

                                   debug   => "-O0 -g",

                                   release => "-O3"),

        thread_scheme    => "(unknown)",

        sys_id           => "VOS",
@@ -220,8 +220,7 @@ sub vms_info { 
        # -m32 should be safe to add as long as driver recognizes

        # -mcpu=ultrasparc

        inherit_from     => [ "solaris-sparcv7-gcc", asm("sparcv9_asm") ],

        cflags           => add_before(picker(default => "-m32 -mcpu=ultrasparc",

                                              debug   => "-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DPEDANTIC -O -g -pedantic -ansi -Wshadow -Wno-long-long -D__EXTENSIONS__")),

        cflags           => add_before("-m32 -mcpu=ultrasparc"),

    },

    "solaris64-sparcv9-gcc" => {

        inherit_from     => [ "solaris-sparcv9-gcc" ],
@@ -239,7 +238,7 @@ sub vms_info { 
        inherit_from     => [ "solaris-common" ],

        cc               => "cc",

        cflags           => add_before(picker(default => "-xstrconst -Xa -DB_ENDIAN -DBN_DIV2W",

                                              debug   => "-g -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG",

                                              debug   => "-g",

                                              release => "-xO5 -xdepend"),

                                       threads("-D_REENTRANT")),

        lflags           => add(threads("-mt")),
@@ -600,7 +599,7 @@ sub vms_info { 
        inherit_from     => [ "BASE_unix" ],

        cc               => "gcc",

        cflags           => combine(picker(default => "-Wall",

                                           debug   => "-O0 -g -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG",

                                           debug   => "-O0 -g",

                                           release => "-O3"),

                                    threads("-pthread")),

        ex_libs          => add("-ldl"),
@@ -1655,7 +1654,7 @@ sub vms_info { 
    "vxworks-ppc750-debug" => {

        inherit_from     => [ "BASE_unix" ],

        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_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -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 -DPEDANTIC -DDEBUG -g",

        sys_id           => "VXWORKS",

        lflags           => "-r",

    },

Configure

+14 −3
Original line number Diff line number Diff line
@@ -77,10 +77,21 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [-Dxxx] [-lx 
# Minimum warning options... any contributions to OpenSSL should at least get

# past these.



my $gcc_devteam_warn = "-DPEDANTIC -DREF_DEBUG -DDEBUG_UNUSED -DBIO_DEBUG -DBLAKE_DEBUG"

        . " -pedantic"

# DEBUG_UNUSED enables __owur (warn unused result) checks.

my $gcc_devteam_warn = "-DDEBUG_UNUSED"

        # -DPEDANTIC complements -pedantic and is meant to mask code that

        # is not strictly standard-compliant and/or implementation-specifc,

        # e.g. inline assembly, disregards to alignment requirements, such

        # that -pedantic would complain about. Incidentally -DPEDANTIC has

        # to be used even in sanitized builds, because sanitizer too is

        # supposed to and does take notice of non-standard behaviour. Then

        # -pedantic with pre-C9x compiler would also complain about 'long

        # long' not being supported. As 64-bit algorithms are common now,

        # it grew impossible to resolve this without sizeable additional

        # code, so we just tell compiler to be pedantic about everything

        # but 'long long' type.

        . " -DPEDANTIC -pedantic -Wno-long-long"

        . " -Wall"

        . " -Wno-long-long"

        . " -Wsign-compare"

        . " -Wmissing-prototypes"

        . " -Wshadow"

crypto/aes/aes_core.c

+0 −5
Original line number Diff line number Diff line
@@ -27,11 +27,6 @@ 
/* Note: rewritten a little bit to provide error control and an OpenSSL-

   compatible API */



#ifndef AES_DEBUG

# ifndef NDEBUG

#  define NDEBUG

# endif

#endif

#include <assert.h>



#include <stdlib.h>

crypto/aes/aes_ecb.c

+0 −5
Original line number Diff line number Diff line
@@ -48,11 +48,6 @@ 
 *

 */



#ifndef AES_DEBUG

# ifndef NDEBUG

#  define NDEBUG

# endif

#endif

#include <assert.h>



#include <openssl/aes.h>

crypto/aes/aes_x86core.c

+0 −5
Original line number Diff line number Diff line
@@ -34,11 +34,6 @@ 
 */





#ifndef AES_DEBUG

# ifndef NDEBUG

#  define NDEBUG

# endif

#endif

#include <assert.h>



#include <stdlib.h>