[src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64 remove...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1ed056e4e9de
branches:  trunk
changeset: 350232:1ed056e4e9de
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jan 08 01:56:31 2017 +0000

description:
remove some local hacks.

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (22 lines):

diff -r 372ff8832766 -r 1ed056e4e9de crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile    Sun Jan 08 01:55:49 2017 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile    Sun Jan 08 01:56:31 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2016/10/14 16:09:44 spz Exp $
+#      $NetBSD: Makefile,v 1.11 2017/01/08 01:56:31 christos Exp $
 
 .include "bsd.own.mk"
 
@@ -12,10 +12,10 @@
 regen:
        for i in $$(find ${OPENSSLSRC} -name \*${MACHINE_ARCH}.pl) \
                $$(find ${OPENSSLSRC}/crypto/bn/asm -name ${MACHINE_ARCH}-\*.pl) \
+               $$(find ${OPENSSLSRC}/crypto/bn/asm -name ${MACHINE_ARCH}-\*.pl) \
                ${OPENSSLSRC}/crypto/bn/asm/rsaz-avx2.pl \
                ${OPENSSLSRC}/crypto/${MACHINE_ARCH}cpuid.pl ; do \
-                (echo "#include <machine/asm.h>"; CC=${CC:Q} perl $$i elf | sed \
-                   -e 's/\(OPENSSL[A-Za-z0-9_]*\)(%rip)/\1@GOTPCREL(%rip)/' \
+                (set +x; echo "#include <machine/asm.h>"; CC=${CC:Q} perl $$i elf | sed \
                    -e 's/.hidden       OPENSSL_cpuid_setup/.globl      OPENSSL_cpuid_setup/' \
                    -e 's/call  OPENSSL_cpuid_setup/call        PIC_PLT(OPENSSL_cpuid_setup)/' \
                    -e 's/rdseedq/rdseed/') \