[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  4fab3e24d62c810bc9165920af1c67c6215c7418 (commit)
      from  92403e77ac57e7c5fe49d2d2f304839757293922 (commit)


- Log -----------------------------------------------------------------
commit 4fab3e24d62c810bc9165920af1c67c6215c7418
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Oct 22 01:24:54 2016 +0200

    Efence is antiquated, remove all traces of using it
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1768)

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

Summary of changes:
 Configurations/10-main.conf |  1 -
 Configurations/90-team.conf | 14 --------------
 2 files changed, 15 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 6c5c2c4..6735dfe 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -736,7 +736,6 @@ sub vms_info {
         inherit_from     => [ "linux-generic32", asm("x86_elf_asm") ],
         cflags           => add(picker(default => "-DL_ENDIAN",
                                        release => "-fomit-frame-pointer")),
-        ex_libs          => add(picker(debug => "-lefence")),
         bn_ops           => "BN_LLONG",
     },
     "linux-aout" => {
diff --git a/Configurations/90-team.conf b/Configurations/90-team.conf
index 92f8422..0a83c22 100644
--- a/Configurations/90-team.conf
+++ b/Configurations/90-team.conf
@@ -12,7 +12,6 @@
         cc               => "gcc",
         cflags           => "-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DOPENSSL_NO_ASM -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror",
         thread_scheme    => "(unknown)",
-        ex_libs          => add(" ","-lefence"),
     },
     "debug-erbridge" => {
         inherit_from     => [ "x86_64_asm" ],
@@ -50,19 +49,6 @@
         thread_scheme    => "pthreads",
         dso_scheme       => "dlfcn",
     },
-    "debug-linux-elf-noefence" => {
-        inherit_from     => [ "x86_elf_asm" ],
-        cc               => "gcc",
-        cflags           => combine("-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -Wall",
-                                    threads("-D_REENTRANT")),
-        ex_libs          => add(" ","-ldl"),
-        bn_ops           => "BN_LLONG",
-        thread_scheme    => "pthreads",
-        dso_scheme       => "dlfcn",
-        shared_target    => "linux-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-    },
     "debug-linux-ia32-aes" => {
         cc               => "gcc",
         cflags           => combine("-DL_ENDIAN -O3 -fomit-frame-pointer -Wall",