[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  1e19eacd6f68c771a23254be037adb2a5d129350 (commit)
       via  fe9e5b9ccce175d296c904486a29218c879adb73 (commit)
      from  022696cab014ffb94c8ef0bfc79c8955b9970eb6 (commit)


- Log -----------------------------------------------------------------
commit 1e19eacd6f68c771a23254be037adb2a5d129350
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Nov 12 16:14:03 2016 +0100

    Configurations/10-main.conf: remove obsolete flag from solaris-x86-gcc.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit fe9e5b9ccce175d296c904486a29218c879adb73
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Nov 12 16:01:47 2016 +0100

    Configurations/10-main.conf: document GCC for Solaris config constraint.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

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

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index dd5085d..3aa519c 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -187,14 +187,12 @@ sub vms_info {
     },
 #### Solaris x86 with GNU C setups
     "solaris-x86-gcc" => {
-        # -DOPENSSL_NO_INLINE_ASM switches off inline assembler. We have
-        # to do it here because whenever GNU C instantiates an assembler
-        # template it surrounds it with #APP #NO_APP comment pair which
-        # (at least Solaris 7_x86) /usr/ccs/bin/as fails to assemble
-        # with "Illegal mnemonic" error message.
+        # NB. GNU C has to be configured to use GNU assembler, and not
+        # /usr/ccs/bin/as. Failure to comply will result in compile
+        # failures [at least] in 32-bit build.
         inherit_from     => [ "solaris-common", asm("x86_elf_asm") ],
         cc               => "gcc",
-        cflags           => add_before(picker(default => "-Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM",
+        cflags           => add_before(picker(default => "-Wall -DL_ENDIAN",
                                               debug   => "-O0 -g",
                                               release => "-O3 -fomit-frame-pointer"),
                                        threads("-pthread")),