[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  6d50589c0434a78733d40d3a0fd7cb97eef1cb94 (commit)
      from  8545051c3652bce7bb962afcb6879c4a6288bc67 (commit)


- Log -----------------------------------------------------------------
commit 6d50589c0434a78733d40d3a0fd7cb97eef1cb94
Author: Andy Polyakov <appro at openssl.org>
Date:   Thu Sep 21 22:47:12 2017 +0200

    Configure: add -Wmisleading-indentation to strict warnings flags.
    
    The warning flag in question was added in GCC version 6, hence
    addition has to be conditional.
    
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    (Merged from https://github.com/openssl/openssl/pull/4401)

-----------------------------------------------------------------------

Summary of changes:
 Configure | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Configure b/Configure
index 326a3ff..b1b847c 100755
--- a/Configure
+++ b/Configure
@@ -148,6 +148,7 @@ my $clang_devteam_warn = ""
         . " -Wconditional-uninitialized"
         . " -Wincompatible-pointer-types-discards-qualifiers"
         . " -Wmissing-variable-declarations"
+        . " -Wno-unknown-warning-option"
         ;
 
 # This adds backtrace information to the memory leak info.  Is only used
@@ -1327,8 +1328,11 @@ if (defined($predefined{__clang__}) && !$disabled{asm}) {
 if ($strict_warnings)
 	{
 	my $wopt;
-	die "ERROR --strict-warnings requires gcc or gcc-alike"
-            unless defined($predefined{__GNUC__});
+	my $gccver = $predefined{__GNUC__} // -1;
+
+	die "ERROR --strict-warnings requires gcc[>=4] or gcc-alike"
+            unless $gccver >= 4;
+	$gcc_devteam_warn .= " -Wmisleading-indentation" if $gccver >= 6;
 	foreach $wopt (split /\s+/, $gcc_devteam_warn)
 		{
 		$config{cflags} .= " $wopt" unless ($config{cflags} =~ /(?:^|\s)$wopt(?:\s|$)/)