Configurations/10-main.conf: remove obsolete flag from solaris-x86-gcc.

[openssl.git] / Configurations / 10-main.conf

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 4ea8f155f802fa617113a6e6cda2bc51eb4c6227..3aa519c9909e17b2237954253ade4663d8f826cb 100644 (file)
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -190,17 +190,9 @@ sub vms_info {
         # 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.
         # 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.

-        # [Above statement is in direct contradition with one below.
-        #  Latter is kept, because it's formally inappropriate to
-        #  modify compile flags in letter release.]
-        # -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.

         inherit_from     => [ "solaris-common", asm("x86_elf_asm") ],
         cc               => "gcc",
         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")),
                                               debug   => "-O0 -g",
                                               release => "-O3 -fomit-frame-pointer"),
                                        threads("-pthread")),