From a01dab94622715fe2dd92a6f87a826cef6724e54 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Wed, 27 Jan 2016 19:16:38 -0500 Subject: [PATCH] Remove x86_gcc_des,x86_gcc_opts This is a followin from !1738, we no longer need those variables. Reviewed-by: Richard Levitte --- Configurations/10-main.conf | 53 +++++++++++---------------- Configurations/90-team.conf | 8 ++-- Configurations/99-personal-rse.conf | 2 +- Configurations/99-personal-steve.conf | 2 +- Configure | 5 +-- 5 files changed, 29 insertions(+), 41 deletions(-) diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index ff115be331..32e4e15988 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -57,7 +57,7 @@ debug_cflags => "-O0 -g", release_cflags => "-O3 -fomit-frame-pointer", thread_cflag => "-pthread", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", + bn_ops => "BN_LLONG", shared_cflag => "-fPIC", shared_ldflag => "-shared", }, @@ -607,7 +607,7 @@ debug_cflags => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG", release_cflags => "-O3 -fomit-frame-pointer", debug_lflags => "-lefence", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", + bn_ops => "BN_LLONG", }, "linux-aout" => { inherit_from => [ asm("x86_asm") ], @@ -616,7 +616,7 @@ debug_cflags => "-O0 -g", release_cflags => "-O3 -fomit-frame-pointer", thread_cflag => "(unknown)", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", + bn_ops => "BN_LLONG", perlasm_scheme => "a.out", }, @@ -762,7 +762,7 @@ "android-x86" => { inherit_from => [ "android", asm("x86_asm") ], release_cflags => "-O3 -fomit-frame-pointer", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", + bn_ops => "BN_LLONG", perlasm_scheme => "android", }, ################################################################ @@ -839,7 +839,7 @@ inherit_from => [ "BSD-generic32", asm("x86_asm") ], cflags => "-DL_ENDIAN -Wall", release_cflags => "-O3 -fomit-frame-pointer", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", + bn_ops => "BN_LLONG", shared_target => "bsd-shared", perlasm_scheme => "a.out", }, @@ -880,7 +880,7 @@ cflags => "-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall", thread_cflag => "(unknown)", lflags => "-ldl", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", + bn_ops => "BN_LLONG", dso_scheme => "dlfcn", shared_target => "bsd-gcc-shared", shared_cflag => "-fPIC", @@ -892,14 +892,14 @@ cflags => "-O -Wall", unistd => "", thread_cflag => "(unknown)", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", + bn_ops => "BN_LLONG", }, "nextstep3.3" => { cc => "cc", cflags => "-O3 -Wall", unistd => "", thread_cflag => "(unknown)", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", + bn_ops => "BN_LLONG", }, # QNX @@ -907,7 +907,6 @@ cc => "cc", cflags => "-DL_ENDIAN -DTERMIO", thread_cflag => "(unknown)", - bn_ops => "${x86_gcc_des} ${x86_gcc_opts}", }, "QNX6" => { cc => "gcc", @@ -922,7 +921,6 @@ cc => "gcc", cflags => "-DL_ENDIAN -O2 -Wall", lflags => "-lsocket", - bn_ops => "${x86_gcc_des} ${x86_gcc_opts}", dso_scheme => "dlfcn", shared_target => "bsd-gcc-shared", shared_cflag => "-fPIC", @@ -946,14 +944,12 @@ cflags => "-DFILIO_H -DNO_STRINGS_H", thread_cflag => "-Kthread", lflags => "-lsocket -lnsl -lresolv -lx", - bn_ops => "${x86_gcc_des} ${x86_gcc_opts}", }, "unixware-2.1" => { cc => "cc", cflags => "-O -DFILIO_H", thread_cflag => "-Kthread", lflags => "-lsocket -lnsl -lresolv -lx", - bn_ops => "${x86_gcc_des} ${x86_gcc_opts}", }, "unixware-7" => { inherit_from => [ asm("x86_elf_asm") ], @@ -961,7 +957,7 @@ cflags => "-O -DFILIO_H -Kalloca", thread_cflag => "-Kthread", lflags => "-lsocket -lnsl", - bn_ops => "BN_LLONG ${x86_gcc_des}", + bn_ops => "BN_LLONG", perlasm_scheme => "elf-1", dso_scheme => "dlfcn", shared_target => "svr5-shared", @@ -974,7 +970,7 @@ cflags => "-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=pentium -Wall", thread_cflag => "-D_REENTRANT", lflags => "-lsocket -lnsl", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", + bn_ops => "BN_LLONG", perlasm_scheme => "elf-1", dso_scheme => "dlfcn", shared_target => "gnu-shared", @@ -988,7 +984,6 @@ cflags => "-belf", thread_cflag => "(unknown)", lflags => "-lsocket -lnsl", - bn_ops => "${x86_gcc_des} ${x86_gcc_opts}", perlasm_scheme => "elf-1", dso_scheme => "dlfcn", shared_target => "svr3-shared", @@ -1001,7 +996,7 @@ cflags => "-O3 -fomit-frame-pointer", thread_cflag => "(unknown)", lflags => "-lsocket -lnsl", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", + bn_ops => "BN_LLONG", perlasm_scheme => "elf-1", dso_scheme => "dlfcn", shared_target => "svr3-shared", @@ -1137,14 +1132,14 @@ # configure with 'perl Configure VC-WIN32 -DUNICODE -D_UNICODE' inherit_from => [ "VC-common", asm("x86_asm") ], sys_id => "WIN32", - bn_ops => "BN_LLONG EXPORT_VAR_AS_FN ${x86_gcc_opts}", + bn_ops => "BN_LLONG EXPORT_VAR_AS_FN", perlasm_scheme => "win32n", build_scheme => [ "mk1mf", "VC-W32" ], }, "VC-CE" => { cc => "cl", sys_id => "WINCE", - bn_ops => "BN_LLONG EXPORT_VAR_AS_FN ${x86_gcc_opts}", + bn_ops => "BN_LLONG EXPORT_VAR_AS_FN", dso_scheme => "win32", build_scheme => [ "mk1mf", "VC-WCE" ], }, @@ -1168,7 +1163,7 @@ thread_cflag => "-D_MT", sys_id => "MINGW32", lflags => "-lws2_32 -lgdi32 -lcrypt32", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN", + bn_ops => "BN_LLONG EXPORT_VAR_AS_FN", perlasm_scheme => "coff", dso_scheme => "win32", shared_target => "cygwin-shared", @@ -1214,7 +1209,7 @@ cc => "cc", cflags => "-DTERMIOS -DL_ENDIAN -O -Wall", sys_id => "UWIN", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", + bn_ops => "BN_LLONG", dso_scheme => "win32", }, @@ -1226,7 +1221,7 @@ debug_cflags => "-g -O0", release_cflags => "-O3 -fomit-frame-pointer", sys_id => "CYGWIN", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", + bn_ops => "BN_LLONG", perlasm_scheme => "coff", dso_scheme => "dlfcn", shared_target => "cygwin-shared", @@ -1274,44 +1269,40 @@ # netware-clib => legacy CLib c-runtime support "netware-clib" => { cc => "mwccnlm", - bn_ops => "${x86_gcc_opts}", build_scheme => [ "mk1mf", "netware" ], }, "netware-clib-bsdsock" => { cc => "mwccnlm", - bn_ops => "${x86_gcc_opts}", build_scheme => [ "mk1mf", "netware" ], }, "netware-clib-gcc" => { cc => "i586-netware-gcc", cflags => "-nostdinc -I/ndk/nwsdk/include/nlm -I/ndk/ws295sdk/include -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYS_NETWARE -O2 -Wall", - bn_ops => "${x86_gcc_opts}", }, "netware-clib-bsdsock-gcc" => { cc => "i586-netware-gcc", cflags => "-nostdinc -I/ndk/nwsdk/include/nlm -DNETWARE_BSDSOCK -DNETDB_USE_INTERNET -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYS_NETWARE -O2 -Wall", - bn_ops => "${x86_gcc_opts}", }, # netware-libc => LibC/NKS support "netware-libc" => { cc => "mwccnlm", - bn_ops => "BN_LLONG ${x86_gcc_opts}", + bn_ops => "BN_LLONG", build_scheme => [ "mk1mf", "netware" ], }, "netware-libc-bsdsock" => { cc => "mwccnlm", - bn_ops => "BN_LLONG ${x86_gcc_opts}", + bn_ops => "BN_LLONG", build_scheme => [ "mk1mf", "netware" ], }, "netware-libc-gcc" => { cc => "i586-netware-gcc", cflags => "-nostdinc -I/ndk/libc/include -I/ndk/libc/include/winsock -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYS_NETWARE -DTERMIO -O2 -Wall", - bn_ops => "BN_LLONG ${x86_gcc_opts}", + bn_ops => "BN_LLONG", }, "netware-libc-bsdsock-gcc" => { cc => "i586-netware-gcc", cflags => "-nostdinc -I/ndk/libc/include -DNETWARE_BSDSOCK -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYS_NETWARE -DTERMIO -O2 -Wall", - bn_ops => "BN_LLONG ${x86_gcc_opts}", + bn_ops => "BN_LLONG", }, #### DJGPP @@ -1321,7 +1312,7 @@ cflags => "-I/dev/env/WATT_ROOT/inc -DTERMIO -DL_ENDIAN -fomit-frame-pointer -O2 -Wall", sys_id => "MSDOS", lflags => "-L/dev/env/WATT_ROOT/lib -lwatt", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", + bn_ops => "BN_LLONG", perlasm_scheme => "a.out", }, @@ -1431,7 +1422,7 @@ cflags => "-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall", thread_cflag => "-pthread", lflags => "-ldl", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", + bn_ops => "BN_LLONG", dso_scheme => "dlfcn", shared_target => "linux-shared", shared_cflag => "-fPIC", diff --git a/Configurations/90-team.conf b/Configurations/90-team.conf index b91ce88d1c..993e078d50 100644 --- a/Configurations/90-team.conf +++ b/Configurations/90-team.conf @@ -39,7 +39,7 @@ cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -mcpu=pentium -Wall", thread_cflag => "-D_REENTRANT", lflags => "-ldl", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", + bn_ops => "BN_LLONG", dso_scheme => "dlfcn", }, "debug-linux-ppro" => { @@ -48,7 +48,7 @@ cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -mcpu=pentiumpro -Wall", thread_cflag => "-D_REENTRANT", lflags => "-ldl", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", + bn_ops => "BN_LLONG", dso_scheme => "dlfcn", }, "debug-linux-elf-noefence" => { @@ -57,7 +57,7 @@ cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -march=i486 -Wall", thread_cflag => "-D_REENTRANT", lflags => "-ldl", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", + bn_ops => "BN_LLONG", dso_scheme => "dlfcn", shared_target => "linux-shared", shared_cflag => "-fPIC", @@ -68,7 +68,7 @@ cflags => "-DAES_EXPERIMENTAL -DL_ENDIAN -O3 -fomit-frame-pointer -Wall", thread_cflag => "-D_REENTRANT", lflags => "-ldl", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", + bn_ops => "BN_LLONG", cpuid_obj => "x86cpuid.o", bn_obj => "bn-586.o co-586.o x86-mont.o", des_obj => "des-586.o crypt586.o", diff --git a/Configurations/99-personal-rse.conf b/Configurations/99-personal-rse.conf index be619194ed..39e1f11884 100644 --- a/Configurations/99-personal-rse.conf +++ b/Configurations/99-personal-rse.conf @@ -11,6 +11,6 @@ cc => "cc", cflags => "-DL_ENDIAN -pipe -O -g -ggdb3 -Wall", thread_cflag => "(unknown)", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", + bn_ops => "BN_LLONG", }, ); diff --git a/Configurations/99-personal-steve.conf b/Configurations/99-personal-steve.conf index 10f9eb7358..0d53b06ecf 100644 --- a/Configurations/99-personal-steve.conf +++ b/Configurations/99-personal-steve.conf @@ -26,7 +26,7 @@ cflags => "$gcc_devteam_warn -pthread -m32 -DL_ENDIAN -DCONF_DEBUG -g", thread_cflag => "-D_REENTRANT", lflags => "-rdynamic -ldl", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", + bn_ops => "BN_LLONG", dso_scheme => "dlfcn", shared_target => "linux-shared", shared_cflag => "-fPIC", diff --git a/Configure b/Configure index ec94edc524..6d36ae1a6b 100755 --- a/Configure +++ b/Configure @@ -97,12 +97,8 @@ my $warn_make_depend = 0; # This adds backtrace information to the memory leak info. my $memleak_devteam_backtrace = "-rdynamic -DCRYPTO_MDEBUG_BACKTRACE"; - my $strict_warnings = 0; -my $x86_gcc_des=""; -my $x86_gcc_opts=""; - # As for $BSDthreads. Idea is to maintain "collective" set of flags, # which would cover all BSD flavors. -pthread applies to them all, # but is treated differently. OpenBSD expands is as -D_POSIX_THREAD @@ -1669,6 +1665,7 @@ sub run_dofile() my $in = shift; my $out = shift; + die "Can't open $in, $!" unless -f $in; # should we remove $out ? system("$config{perl} -I. -Mconfigdata util/dofile.pl -o\"Configure\" $in > $out.new"); exit 1 if $? != 0;