[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  c5f9317fb51225fcaee41790841cfa388e9ec0e8 (commit)
      from  b7557ccf361d61455535d1305f94d04da7235fdb (commit)


- Log -----------------------------------------------------------------
commit c5f9317fb51225fcaee41790841cfa388e9ec0e8
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jan 22 12:49:28 2016 +0100

    Configurations - no_asm_filler is long gone, don't use it
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 Configurations/99-personal-geoff.conf   | 2 --
 Configurations/99-personal-levitte.conf | 2 --
 2 files changed, 4 deletions(-)

diff --git a/Configurations/99-personal-geoff.conf b/Configurations/99-personal-geoff.conf
index e5338da..7f847fe 100644
--- a/Configurations/99-personal-geoff.conf
+++ b/Configurations/99-personal-geoff.conf
@@ -7,7 +7,6 @@
 
 %targets = (
     "debug-geoff32" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "gcc",
         cflags           => "-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long",
         thread_cflag     => "-D_REENTRANT",
@@ -19,7 +18,6 @@
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
     "debug-geoff64" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "gcc",
         cflags           => "-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long",
         thread_cflag     => "-D_REENTRANT",
diff --git a/Configurations/99-personal-levitte.conf b/Configurations/99-personal-levitte.conf
index e34bb12..d4a87b6 100644
--- a/Configurations/99-personal-levitte.conf
+++ b/Configurations/99-personal-levitte.conf
@@ -20,7 +20,6 @@
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
     "debug-levitte-linux-noasm" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "gcc",
         cflags           => "-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -ggdb -g3 -Wall",
         thread_cflag     => "-D_REENTRANT",
@@ -45,7 +44,6 @@
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
     },
     "debug-levitte-linux-noasm-extreme" => {
-        inherit_from     => [ "no_asm_filler" ],
         cc               => "gcc",
         cflags           => "-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe",
         thread_cflag     => "-D_REENTRANT",