[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  c75065e1ea4d4597a11f6bbe1e00e9e9f77e94aa (commit)
      from  3e67b33346d066feb3111610e1d0d096899fd148 (commit)


- Log -----------------------------------------------------------------
commit c75065e1ea4d4597a11f6bbe1e00e9e9f77e94aa
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon Mar 14 20:56:44 2016 +0100

    Configurations/10-main.conf: freeze -std option in darwin*-ppc-cc.
    
    RT#4422
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 Configurations/10-main.conf | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 5b64803..8909700 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1507,15 +1507,18 @@ sub vc_wince_info {
         shared_ldflag    => "-dynamiclib",
         shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
     },
+    # Option "freeze" such as -std=gnu9x can't negatively interfere
+    # with future defaults for below two targets, because MacOS X
+    # for PPC has no future, it was discontinued by vendor in 2009.
     "darwin-ppc-cc" => {
         inherit_from     => [ "darwin-common", asm("ppc32_asm") ],
-        cflags           => add("-arch ppc -DB_ENDIAN -Wa,-force_cpusubtype_ALL"),
+        cflags           => add("-arch ppc -std=gnu9x -DB_ENDIAN -Wa,-force_cpusubtype_ALL"),
         perlasm_scheme   => "osx32",
         shared_ldflag    => "-arch ppc -dynamiclib",
     },
     "darwin64-ppc-cc" => {
         inherit_from     => [ "darwin-common", asm("ppc64_asm") ],
-        cflags           => add("-arch ppc64 -DB_ENDIAN"),
+        cflags           => add("-arch ppc64 -std=gnu9x -DB_ENDIAN"),
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         perlasm_scheme   => "osx64",
         shared_ldflag    => "-arch ppc64 -dynamiclib",