From 6e361a5efba1d72a7ea4416e1d69e02910fa9414 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 10 Jul 2014 20:02:58 +0000
Subject: Nuke OPENSSL_NONPIC_relocated since nothing uses it.

ok miod@
---
 src/lib/libcrypto/cryptlib.c         | 3 +--
 src/lib/libcrypto/cryptlib.h         | 3 +--
 src/lib/libssl/src/crypto/cryptlib.c | 3 +--
 src/lib/libssl/src/crypto/cryptlib.h | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/cryptlib.c b/src/lib/libcrypto/cryptlib.c
index 221a50b70a..86f51917e2 100644
--- a/src/lib/libcrypto/cryptlib.c
+++ b/src/lib/libcrypto/cryptlib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptlib.c,v 1.28 2014/07/10 13:58:21 jsing Exp $ */
+/* $OpenBSD: cryptlib.c,v 1.29 2014/07/10 20:02:58 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -680,7 +680,6 @@ OPENSSL_ia32cap_loc(void)
 	return NULL;
 }
 #endif
-int OPENSSL_NONPIC_relocated = 0;
 
 #if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ)
 void
diff --git a/src/lib/libcrypto/cryptlib.h b/src/lib/libcrypto/cryptlib.h
index b45f2c03b4..bd4c4da3aa 100644
--- a/src/lib/libcrypto/cryptlib.h
+++ b/src/lib/libcrypto/cryptlib.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptlib.h,v 1.20 2014/07/10 13:58:21 jsing Exp $ */
+/* $OpenBSD: cryptlib.h,v 1.21 2014/07/10 20:02:58 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -84,7 +84,6 @@ void OPENSSL_cpuid_setup(void);
 extern unsigned int OPENSSL_ia32cap_P[];
 void OPENSSL_showfatal(const char *fmta,...);
 void *OPENSSL_stderr(void);
-extern int OPENSSL_NONPIC_relocated;
 
 #ifdef  __cplusplus
 }
diff --git a/src/lib/libssl/src/crypto/cryptlib.c b/src/lib/libssl/src/crypto/cryptlib.c
index 221a50b70a..86f51917e2 100644
--- a/src/lib/libssl/src/crypto/cryptlib.c
+++ b/src/lib/libssl/src/crypto/cryptlib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptlib.c,v 1.28 2014/07/10 13:58:21 jsing Exp $ */
+/* $OpenBSD: cryptlib.c,v 1.29 2014/07/10 20:02:58 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -680,7 +680,6 @@ OPENSSL_ia32cap_loc(void)
 	return NULL;
 }
 #endif
-int OPENSSL_NONPIC_relocated = 0;
 
 #if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ)
 void
diff --git a/src/lib/libssl/src/crypto/cryptlib.h b/src/lib/libssl/src/crypto/cryptlib.h
index b45f2c03b4..bd4c4da3aa 100644
--- a/src/lib/libssl/src/crypto/cryptlib.h
+++ b/src/lib/libssl/src/crypto/cryptlib.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptlib.h,v 1.20 2014/07/10 13:58:21 jsing Exp $ */
+/* $OpenBSD: cryptlib.h,v 1.21 2014/07/10 20:02:58 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -84,7 +84,6 @@ void OPENSSL_cpuid_setup(void);
 extern unsigned int OPENSSL_ia32cap_P[];
 void OPENSSL_showfatal(const char *fmta,...);
 void *OPENSSL_stderr(void);
-extern int OPENSSL_NONPIC_relocated;
 
 #ifdef  __cplusplus
 }
-- 
cgit v1.2.3-55-g6feb