when building with openssl *_init_ctx and other inline symbols
are supposed to be provided by non *-stream compilation units so drop
extern from *-stream c files.
Fixes linking ie:
mold: error: duplicate symbol: ../lib/.libs/libgnu.a(libgnu_la-md5.o):
../lib/.libs/libgnu.a(libgnu_la-md5-stream.o): md5_init_ctx
mold: error: duplicate symbol: ../lib/.libs/libgnu.a(libgnu_la-md5.o):
../lib/.libs/libgnu.a(libgnu_la-md5-stream.o): md5_process_bytes
mold: error: duplicate symbol: ../lib/.libs/libgnu.a(libgnu_la-md5.o):
../lib/.libs/libgnu.a(libgnu_la-md5-stream.o): md5_process_block
mold: error: duplicate symbol: ../lib/.libs/libgnu.a(libgnu_la-md5.o):
../lib/.libs/libgnu.a(libgnu_la-md5-stream.o): md5_finish_ctx
mold: error: duplicate symbol: ../lib/.libs/libgnu.a(libgnu_la-md5.o):
../lib/.libs/libgnu.a(libgnu_la-md5-stream.o): md5_buffer
mold: error: duplicate symbol: ../lib/.libs/libgnu.a(libgnu_la-md5.o):
../lib/.libs/libgnu.a(libgnu_la-md5-stream.o): md5_read_ctx
Fixes: 439979c000 ("md5: Clarify module to source relation.")
Fixes: ecf145d277 ("sha1: Clarify module to source relation.")
Fixes: 36cd6e0a4e ("sha256: Clarify module to source relation.")
Fixes: 2b6d343ff9 ("sha512: Clarify module to source relation.")
Fixes: 81ca30b0de ("sm3-buffer: New module.")
Signed-off-by: Jan Palus <[email protected]>
---
lib/md5-stream.c | 3 ---
lib/sha1-stream.c | 3 ---
lib/sha256-stream.c | 3 ---
lib/sha512-stream.c | 3 ---
lib/sm3-stream.c | 3 ---
5 files changed, 15 deletions(-)
diff --git a/lib/md5-stream.c b/lib/md5-stream.c
index fdd2bd8b4b..2cbdda6b0f 100644
--- a/lib/md5-stream.c
+++ b/lib/md5-stream.c
@@ -22,9 +22,6 @@
#include <config.h>
/* Specification. */
-#if HAVE_OPENSSL_MD5
-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
-#endif
#include "md5.h"
#include <stdlib.h>
diff --git a/lib/sha1-stream.c b/lib/sha1-stream.c
index cbdf95ab76..b713e678a6 100644
--- a/lib/sha1-stream.c
+++ b/lib/sha1-stream.c
@@ -24,9 +24,6 @@
#include <config.h>
/* Specification. */
-#if HAVE_OPENSSL_SHA1
-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
-#endif
#include "sha1.h"
#include <stdlib.h>
diff --git a/lib/sha256-stream.c b/lib/sha256-stream.c
index 690ca967dd..82abc2c8af 100644
--- a/lib/sha256-stream.c
+++ b/lib/sha256-stream.c
@@ -23,9 +23,6 @@
#include <config.h>
/* Specification. */
-#if HAVE_OPENSSL_SHA256
-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
-#endif
#include "sha256.h"
#include <stdlib.h>
diff --git a/lib/sha512-stream.c b/lib/sha512-stream.c
index 74fdd5047d..6362e55a6a 100644
--- a/lib/sha512-stream.c
+++ b/lib/sha512-stream.c
@@ -23,9 +23,6 @@
#include <config.h>
/* Specification. */
-#if HAVE_OPENSSL_SHA512
-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
-#endif
#include "sha512.h"
#include <stdlib.h>
diff --git a/lib/sm3-stream.c b/lib/sm3-stream.c
index f9ed05a944..2a96fd734e 100644
--- a/lib/sm3-stream.c
+++ b/lib/sm3-stream.c
@@ -26,9 +26,6 @@
#include <config.h>
/* Specification. */
-#if HAVE_OPENSSL_SM3
-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
-#endif
#include "sm3.h"
#include <stdlib.h>
--
2.47.0
