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 8b509d4a340d7fe239fe685722c9163a31a0a9db..d88a7987f273808b5e5af8ec05bee56ce9713d00 100644 (file)
--- 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 7828d47daea16c24207ed5e73524e21217d1bc80..1d0ab88b1360ceada6136be5bd2e1a33cec37381 100644 (file)
--- 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")));