The branch master has been updated
via a1d3f3d1d0711eeece52f132e73b533d814770ac (commit)
from df04754be7a73cbe813cb58f2f7b42d8e3402c56 (commit)
- Log -----------------------------------------------------------------
commit a1d3f3d1d0711eeece52f132e73b533d814770ac
Author: Richard Levitte <levi...@openssl.org>
Date: Wed Dec 2 18:44:26 2015 +0100
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: Andy Polyakov <ap...@openssl.org>
-----------------------------------------------------------------------
Summary of changes:
Configure | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/Configure b/Configure
index 6de3757..9e9f100 100755
--- a/Configure
+++ b/Configure
@@ -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";
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
