Commit a1d3f3d1 authored by Richard Levitte's avatar Richard Levitte
Browse files

Move the backtrace memleak options to a separate variable 



The contents of this variable ($memleak_devteam_backtrace) is added to
$cflags unless we build for a platform we know doesn't support gcc's
-rdynamic och backtrace() and friends.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent df04754b

Configure

+13 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimenta 
# Minimum warning options... any contributions to OpenSSL should at least get

# past these.



my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Wtype-limits -Werror -rdynamic -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DCRYPTO_MDEBUG_BACKTRACE -DREF_CHECK -DDEBUG_UNUSED";

my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Wtype-limits -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DDEBUG_UNUSED";



# These are used in addition to $gcc_devteam_warn when the compiler is clang.

# TODO(openssl-team): fix problems and investigate if (at least) the
@@ -108,6 +108,11 @@ my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare 
# -Wextended-offsetof

my $clang_devteam_warn = "-Wno-unused-parameter -Wno-missing-field-initializers -Wno-language-extension-token -Wno-extended-offsetof -Wconditional-uninitialized -Qunused-arguments -Wincompatible-pointer-types-discards-qualifiers -Wmissing-variable-declarations";



# These are used in addition to $gcc_devteam_warn unless this is a mingw build.

# This adds backtrace information to the memory leak info.

my $memleak_devteam_backtrace = "-rdynamic -DCRYPTO_MDEBUG_BACKTRACE";





my $strict_warnings = 0;



my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL";
@@ -1749,6 +1754,13 @@ if ($strict_warnings) 
			$cflags .= " $wopt" unless ($cflags =~ /(^|\s)$wopt(\s|$)/)

			}

		}

	if ($target !~ /^mingw/)

		{

		foreach $wopt (split /\s+/, $memleak_devteam_backtrace)

			{

			$cflags .= " $wopt" unless ($cflags =~ /(^|\s)$wopt(\s|$)/)

			}

		}

	}



open(IN,"<Makefile.org") || die "unable to read Makefile.org:$!\n";