From: Florian Weimer <fweimer@redhat.com>
Date: Thu, 26 Jul 2018 06:34:05 +0000 (+0200)
Subject: htl: Use weak aliases for public symbols
X-Git-Tag: glibc-2.28~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cfba5dbb10cc3abde632b46c60c10b2843917035;p=thirdparty%2Fglibc.git

htl: Use weak aliases for public symbols

Strong definitions of flockfile, funlockfile, ftrylockfile can conflict
with application symbols when linking statically.
---

diff --git a/ChangeLog b/ChangeLog
index 8b509d4a340..d88a7987f27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-26  Florian Weimer  <fweimer@redhat.com>
+
+	* htl/lockfile.c (flockfile, funlockfile, ftrylockfile): Use weak
+	aliases for symbols not in the implementation namespace.
+
 2018-07-25  Carlos O'Donell <carlos@redhat.com>
 
 	[BZ #23393]
diff --git a/htl/lockfile.c b/htl/lockfile.c
index 7828d47daea..1d0ab88b136 100644
--- a/htl/lockfile.c
+++ b/htl/lockfile.c
@@ -53,8 +53,8 @@ int _IO_ftrylockfile (FILE *)
      __attribute__ ((alias ("_cthreads_ftrylockfile")));
 
 void flockfile (FILE *)
-     __attribute__ ((alias ("_cthreads_flockfile")));
+     __attribute__ ((weak, alias ("_cthreads_flockfile")));
 void funlockfile (FILE *)
-     __attribute__ ((alias ("_cthreads_funlockfile")));
+     __attribute__ ((weak, alias ("_cthreads_funlockfile")));
 int ftrylockfile (FILE *)
-     __attribute__ ((alias ("_cthreads_ftrylockfile")));
+     __attribute__ ((weak, alias ("_cthreads_ftrylockfile")));