Handle clang -Wignored-attributes on weak aliases

Clang issues a warning for double alias redirection, indicating that thei
original symbol is used even if a weak definition attempts to override it.

For instance, in the construction:

  int __internal_impl (...) {}
  weak_alias (__internal_impl, external_impl);
  #if SOMETHING
  weak_alias (external_impl, another_external_impl)
  #endif

Clang warns that another_external_impl always resolves to __internal_impl,
even if external_impl is a weak reference. Using the internal symbol for
both aliases resolves this warning.

This issue also occurs with certain libc_hidden_def usage:

  int __internal_impl (...) {}
  weak_alias (__internal_impl, __internal_alias)
  libc_hidden_weak (__internal_alias)

In this case, using a strong_alias is sufficient to avoid the warning
(since the alias is internal, there is no need to use a weak alias).

However, for the constructions like:

  int __internal_impl (...) {}
  weak_alias (__internal_impl, __internal_alias)
  libc_hidden_def (__internal_alias)
  weak_alias (__internal_impl, external_alias)
  libc_hidden_def (external_alias)

Clang warns that the internal external_alias will always resolve to
__GI___internal_impl eve if a weak definition to __GI_internal_impl is
overriden.  For this case, a new macro named static_weak_alias is used
to create a strong alias for SHARED, or a weak_alias otherwise.

With these changes, there is no need to check and enable the
-Wno-ignored-attributes suppression when using clang.

diff --git a/Makefile.in b/Makefile.in
index 15b44842ae75bdd03d9732937d04a7c6bdd315f7..e40dcbbc78b284968c61b807b8dff628e76e97cd 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,7 +5,6 @@ TEST_CXX = @TEST_CXX@
 test-cc-option-wimplicit-fallthrough = @libc_cv_test_cc_wimplicit_fallthrough@
 test-config-cflags-mprefer-vector-width = @libc_cv_test_cc_mprefer_vector_width@
 test-config-cflags-signaling-nans = @libc_cv_test_cc_signaling_nans@
-test-config-cflags-wno-ignored-attributes = @libc_cv_test_wno_ignored_attributes@
 test-cc-option-wfree-labels = @libc_cv_test_cc_wfree_labels@
 test-cc-option-wmissing-parameter-name = @libc_cv_test_cc_wmissing_parameter_name@
 test-enable-cet = @test_enable_cet@
@@ -26,7 +25,6 @@ check xcheck test:
                cc-option-wimplicit-fallthrough="$(test-cc-option-wimplicit-fallthrough)" \
                config-cflags-mprefer-vector-width="$(test-config-cflags-mprefer-vector-width)" \
                config-cflags-signaling-nans="$(test-config-cflags-signaling-nans)" \
-               config-cflags-wno-ignored-attributes="$(test-config-cflags-wno-ignored-attributes)" \
                cc-option-wfree-labels="$(test-cc-option-wfree-labels)" \
                cc-option-wmissing-parameter-name="$(test-cc-option-wmissing-parameter-name)" \
                enable-cet="$(test-enable-cet)" \

diff --git a/configure b/configure
index 85bfeec8a907ce562fa665a475df7c77b20bad2c..122020db69796f2395e8157d32b68180ca7d0fbd 100755 (executable)
--- a/configure
+++ b/configure
@@ -655,7 +655,6 @@ libc_cv_cc_loop_to_function
 libc_cv_test_cc_signaling_nans
 libc_cv_cc_submachine
 libc_cv_cc_nofma
-libc_cv_test_wno_ignored_attributes
 libc_cv_has_glob_dat
 libc_cv_fpie
 libc_cv_test_static_pie
@@ -7544,75 +7543,6 @@ rm -f conftest*
 config_vars="$config_vars
 have-test-mtls-traditional = $libc_cv_test_mtls_traditional"
 
-conftest_code="
-void __foo (void)
-{
-}
-extern __typeof (__foo) foo __attribute__ ((weak, alias (\"__foo\")));
-extern __typeof (__foo) bar __attribute__ ((weak, alias (\"foo\")));
-"
-
-cat > conftest.c <<EOF
-$conftest_code
-EOF
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if -Wno-ignored-attributes is required for aliases" >&5
-printf %s "checking if -Wno-ignored-attributes is required for aliases... " >&6; }
-if test ${libc_cv_wno_ignored_attributes+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)   if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -c -Werror -Wno-ignored-attributes conftest.c -o conftest 1>&5'
-  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }
-  then
-    libc_cv_wno_ignored_attributes="-Wno-ignored-attributes"
-  else
-    libc_cv_wno_ignored_attributes=
-  fi
- ;;
-esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_wno_ignored_attributes" >&5
-printf "%s\n" "$libc_cv_wno_ignored_attributes" >&6; }
-if test "$TEST_CC" = "$CC"; then
-  libc_cv_test_wno_ignored_attributes=$libc_cv_wno_ignored_attributes
-else
-
-saved_CC="$CC"
-CC="$TEST_CC"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if -Wno-ignored-attributes is required for aliases in testing" >&5
-printf %s "checking if -Wno-ignored-attributes is required for aliases in testing... " >&6; }
-if test ${libc_cv_test_wno_ignored_attributes+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)       if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -c -Werror -Wno-ignored-attributes conftest.c -o conftest 1>&5'
-  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }
-      then
-       libc_cv_test_wno_ignored_attributes="-Wno-ignored-attributes"
-      else
-       libc_cv_test_wno_ignored_attributes=
-      fi ;;
-esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_test_wno_ignored_attributes" >&5
-printf "%s\n" "$libc_cv_test_wno_ignored_attributes" >&6; }
-
-CC="$saved_CC"
-
-fi
-rm -f conftest*
-config_vars="$config_vars
-config-cflags-wno-ignored-attributes = $libc_cv_wno_ignored_attributes"
-
-
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -Wno-maybe-uninitialized" >&5
 printf %s "checking for -Wno-maybe-uninitialized... " >&6; }
 if test ${libc_cv_wno_maybe_uninitialized+y}

diff --git a/configure.ac b/configure.ac
index 2cb49f49bc2834420ea8d47d267c4c3e8c253b26..14a0f2dee89954376ef25d9143fe16b1f9d3b6ec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1420,30 +1420,6 @@ LIBC_TRY_TEST_CC_COMMAND([for traditional tls support],
 LIBC_CONFIG_VAR([have-test-mtls-traditional],
                [$libc_cv_test_mtls_traditional])
 
-dnl clang emits an warning for a double alias redirection, to warn the
-dnl original symbol is sed even when weak definition overrides it.
-dnl It is a usual pattern for weak_alias, where multiple alias point to
-dnl same symbol.
-conftest_code="
-void __foo (void)
-{
-}
-extern __typeof (__foo) foo __attribute__ ((weak, alias (\"__foo\")));
-extern __typeof (__foo) bar __attribute__ ((weak, alias (\"foo\")));
-"
-LIBC_TRY_CC_AND_TEST_CC_COMMAND([if -Wno-ignored-attributes is required for aliases],
-  [$conftest_code],
-  [-c -Werror -Wno-ignored-attributes],
-  libc_cv_wno_ignored_attributes,
-  [libc_cv_wno_ignored_attributes="-Wno-ignored-attributes"],
-  [libc_cv_wno_ignored_attributes=],
-  libc_cv_test_wno_ignored_attributes,
-  [libc_cv_test_wno_ignored_attributes="-Wno-ignored-attributes"],
-  [libc_cv_test_wno_ignored_attributes=])
-LIBC_CONFIG_VAR([config-cflags-wno-ignored-attributes],
-               [$libc_cv_wno_ignored_attributes])
-AC_SUBST(libc_cv_test_wno_ignored_attributes)
-
 AC_CACHE_CHECK([for -Wno-maybe-uninitialized],
                 libc_cv_wno_maybe_uninitialized, [dnl
                LIBC_TRY_CC_OPTION([-Werror -Wno-maybe-uninitialized],

diff --git a/dirent/Makefile b/dirent/Makefile
index f469b7f25d2521bc50e3dcc1f55d290f9b620d81..242fd4941aac6f09c66631dd80338aa35d03d2a9 100644 (file)
--- a/dirent/Makefile
+++ b/dirent/Makefile
@@ -85,7 +85,6 @@ CFLAGS-scandir.c += $(uses-callbacks)
 CFLAGS-scandir64.c += $(uses-callbacks)
 CFLAGS-scandir-tail.c += $(uses-callbacks)
 CFLAGS-scandir64-tail.c += $(uses-callbacks)
-CFLAGS-dirfd.c += $(config-cflags-wno-ignored-attributes)
 
 include ../Rules
 

diff --git a/include/libc-symbols.h b/include/libc-symbols.h
index 2f9453e0d7be52eb05d5591d5af03a773ef016be..5bee0c4311ac7565ab5ed0562fac31ef11977acf 100644 (file)
--- a/include/libc-symbols.h
+++ b/include/libc-symbols.h
@@ -156,6 +156,16 @@
   extern __typeof (name) aliasname __attribute__ ((weak, alias (#name))) \
     __attribute_copy__ (name);
 
+/* Define a strong_alias for SHARED, or weak_alias otherwise.  It is
+   used to avoid potential compiler warnings with weak alias indirection
+   (when weak alias will always resolved to an symbol even if a weak
+   definition also exists).  */
+# ifdef SHARED
+#  define static_weak_alias(name, aliasname) strong_alias (name, aliasname)
+# else
+#  define static_weak_alias(name, aliasname) weak_alias (name, aliasname)
+# endif
+
 /* Declare SYMBOL as weak undefined symbol (resolved to 0 if not defined).  */
 # define weak_extern(symbol) _weak_extern (weak symbol)
 # define _weak_extern(expr) _Pragma (#expr)

diff --git a/inet/Makefile b/inet/Makefile
index 104b5828bf262ecc1648ed54b5c4cc8f6954ccb4..a5729360860ea9fa3ab27c9b7471929bc191c493 100644 (file)
--- a/inet/Makefile
+++ b/inet/Makefile
@@ -124,9 +124,6 @@ ifeq ($(have-thread-library),yes)
 CFLAGS-rcmd.c += -fexceptions
 CFLAGS-either_ntoh.c += -fexceptions
 CFLAGS-either_hton.c += -fexceptions
-CFLAGS-in6_addr.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-if_index.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-ifaddrs.c += $(config-cflags-wno-ignored-attributes)
 
 CFLAGS-tst-checks-posix.c += -std=c99
 CFLAGS-tst-sockaddr.c += -fno-strict-aliasing

diff --git a/inet/in6_addr.c b/inet/in6_addr.c
index df99e4a23d36970b1b12d5fe14f888a2ac59ecda..f7f39fe395247a50dd20ff1a4f9ae95600d470a4 100644 (file)
--- a/inet/in6_addr.c
+++ b/inet/in6_addr.c
@@ -20,10 +20,10 @@
 const struct in6_addr __in6addr_any =
 { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } };
 libc_hidden_data_def (__in6addr_any)
-weak_alias (__in6addr_any, in6addr_any)
+static_weak_alias (__in6addr_any, in6addr_any)
 libc_hidden_data_weak (in6addr_any)
 const struct in6_addr __in6addr_loopback =
 { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } };
 libc_hidden_data_def (__in6addr_loopback)
-weak_alias (__in6addr_loopback, in6addr_loopback)
+static_weak_alias (__in6addr_loopback, in6addr_loopback)
 libc_hidden_data_weak (in6addr_loopback)

diff --git a/io/Makefile b/io/Makefile
index 435f5a994f3b12de7d77b721025d033d6b09be08..0810c0aa048c3e5ef5e2bd0bc4162d462fb6936c 100644 (file)
--- a/io/Makefile
+++ b/io/Makefile
@@ -266,21 +266,20 @@ endif
 
 include ../Rules
 
-CFLAGS-open.c += -fexceptions -fasynchronous-unwind-tables $(config-cflags-wno-ignored-attributes)
-CFLAGS-openat.c += $(config-cflags-wno-ignored-attributes)
+CFLAGS-open.c += -fexceptions -fasynchronous-unwind-tables
 CFLAGS-open64.c += -fexceptions -fasynchronous-unwind-tables
 CFLAGS-creat.c += -fexceptions -fasynchronous-unwind-tables
 CFLAGS-creat64.c += -fexceptions -fasynchronous-unwind-tables
-CFLAGS-fcntl.c += -fexceptions -fasynchronous-unwind-tables $(config-cflags-wno-ignored-attributes)
-CFLAGS-fcntl64.c += -fexceptions -fasynchronous-unwind-tables $(config-cflags-wno-ignored-attributes)
+CFLAGS-fcntl.c += -fexceptions -fasynchronous-unwind-tables
+CFLAGS-fcntl64.c += -fexceptions -fasynchronous-unwind-tables
 CFLAGS-poll.c += -fexceptions -fasynchronous-unwind-tables
 CFLAGS-ppoll.c += -fexceptions -fasynchronous-unwind-tables
 CFLAGS-lockf.c += -fexceptions -fasynchronous-unwind-tables
-CFLAGS-lockf64.c += -fexceptions -fasynchronous-unwind-tables $(config-cflags-wno-ignored-attributes)
+CFLAGS-lockf64.c += -fexceptions -fasynchronous-unwind-tables
 CFLAGS-statfs.c += -fexceptions
 CFLAGS-fstatfs.c += -fexceptions
-CFLAGS-statvfs.c += -fexceptions $(config-cflags-wno-ignored-attributes)
-CFLAGS-fstatvfs.c += -fexceptions $(config-cflags-wno-ignored-attributes)
+CFLAGS-statvfs.c += -fexceptions
+CFLAGS-fstatvfs.c += -fexceptions
 CFLAGS-fts.c += -Wno-uninitialized $(uses-callbacks) -fexceptions
 CFLAGS-fts64.c += -Wno-uninitialized $(uses-callbacks) -fexceptions
 CFLAGS-fts64-time64.c += -Wno-uninitialized $(uses-callbacks) -fexceptions
@@ -291,10 +290,9 @@ CFLAGS-posix_fallocate.c += -fexceptions
 CFLAGS-posix_fallocate64.c += -fexceptions
 CFLAGS-fallocate.c += -fexceptions
 CFLAGS-fallocate64.c += -fexceptions
-CFLAGS-read.c += -fexceptions -fasynchronous-unwind-tables $(config-cflags-wno-ignored-attributes)
-CFLAGS-write.c += -fexceptions -fasynchronous-unwind-tables $(config-cflags-wno-ignored-attributes)
+CFLAGS-read.c += -fexceptions -fasynchronous-unwind-tables
+CFLAGS-write.c += -fexceptions -fasynchronous-unwind-tables
 CFLAGS-close.c += -fexceptions -fasynchronous-unwind-tables
-CFLAGS-lseek64.c += $(config-cflags-wno-ignored-attributes)
 CFLAGS-tst-read-zero.c += $(no-fortify-source) -D_FORTIFY_SOURCE=$(supported-fortify)
 
 CFLAGS-test-stat.c += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE

diff --git a/io/Versions b/io/Versions
index 04d196eee0b01aeebb551a66701233e57f53af5e..e5f297e39e8e26065e6e6d68c3d64252c1a1e2d9 100644 (file)
--- a/io/Versions
+++ b/io/Versions
@@ -138,7 +138,6 @@ libc {
     closefrom;
   }
   GLIBC_PRIVATE {
-    __libc_fcntl64;
     __fcntl_nocancel;
     __open64_nocancel;
     __write_nocancel;

diff --git a/io/lockf64.c b/io/lockf64.c
index c490730d1fd81a3d35409f7a7da8524be8e9f79e..354665cea86c813f7780c160a83b126c052ab3a7 100644 (file)
--- a/io/lockf64.c
+++ b/io/lockf64.c
@@ -58,5 +58,5 @@ __lockf64 (int fd, int cmd, off64_t len64)
 }
 weak_alias (__lockf64, lockf64)
 #ifdef __OFF_T_MATCHES_OFF64_T
-weak_alias (lockf64, lockf)
+weak_alias (__lockf64, lockf)
 #endif

diff --git a/libio/Makefile b/libio/Makefile
index 6ce669e1030c07b8410c27d9dd9f84256150328e..2bc98365225ed42563c6ef7a7e3948ee15c13f34 100644 (file)
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -198,18 +198,18 @@ CFLAGS-getchar.c += -fexceptions
 CFLAGS-getwc.c += -fexceptions
 CFLAGS-getwchar.c += -fexceptions
 CFLAGS-iofclose.c += -fexceptions
-CFLAGS-iofflush.c += -fexceptions $(config-cflags-wno-ignored-attributes)
+CFLAGS-iofflush.c += -fexceptions
 CFLAGS-iofgetpos64.c += -fexceptions
 CFLAGS-iofgetpos.c += -fexceptions
 CFLAGS-iofgets.c += -fexceptions
 CFLAGS-iofgetws.c += -fexceptions
-CFLAGS-iofputs.c += -fexceptions $(config-cflags-wno-ignored-attributes)
+CFLAGS-iofputs.c += -fexceptions
 CFLAGS-iofputws.c += -fexceptions
 CFLAGS-iofread.c += -fexceptions
 CFLAGS-iofsetpos64.c += -fexceptions
 CFLAGS-iofsetpos.c += -fexceptions
 CFLAGS-ioftell.c += -fexceptions
-CFLAGS-iofwrite.c += -fexceptions $(config-cflags-wno-ignored-attributes)
+CFLAGS-iofwrite.c += -fexceptions
 CFLAGS-iogetdelim.c += -fexceptions
 CFLAGS-iogetline.c += -fexceptions
 CFLAGS-iogets.c += -fexceptions
@@ -239,14 +239,6 @@ CFLAGS-oldiofopen.c += -fexceptions
 CFLAGS-iofopen.c += -fexceptions
 CFLAGS-iofopen64.c += -fexceptions
 CFLAGS-oldtmpfile.c += -fexceptions
-CFLAGS-fileno.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-feof_u.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-ferror_u.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-getc_u.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-iofflush_u.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-putc_u.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-iofgets_u.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-iofputs_u.c += $(config-cflags-wno-ignored-attributes)
 # XXX Do we need filedoalloc and wfiledoalloc?  Others?
 
 # Prevent fortification as these are built with -O0

diff --git a/libio/feof_u.c b/libio/feof_u.c
index 4d2babe3626c49a206f90741618cd5ef4781c470..36a1e5b62862cdafdf47504f17b58ed23a0554a1 100644 (file)
--- a/libio/feof_u.c
+++ b/libio/feof_u.c
@@ -35,5 +35,5 @@ __feof_unlocked (FILE *fp)
   CHECK_FILE (fp, EOF);
   return _IO_feof_unlocked (fp);
 }
-weak_alias (__feof_unlocked, feof_unlocked)
+static_weak_alias (__feof_unlocked, feof_unlocked)
 libc_hidden_weak (feof_unlocked)

diff --git a/libio/ferror_u.c b/libio/ferror_u.c
index 0e19e0c198b3f1944b87370105e152fafaedfab4..d81facfac4da92510a7f78e07c27c9a69689dfa3 100644 (file)
--- a/libio/ferror_u.c
+++ b/libio/ferror_u.c
@@ -35,5 +35,5 @@ __ferror_unlocked (FILE *fp)
   CHECK_FILE (fp, EOF);
   return _IO_ferror_unlocked (fp);
 }
-weak_alias (__ferror_unlocked, ferror_unlocked)
+static_weak_alias (__ferror_unlocked, ferror_unlocked)
 libc_hidden_weak (ferror_unlocked)

diff --git a/libio/fileno.c b/libio/fileno.c
index d1e945f54944659a14f6a119b64bc80144bb7844..d580582b4d93c9ed8bbda942aac43cd41a864b94 100644 (file)
--- a/libio/fileno.c
+++ b/libio/fileno.c
@@ -41,7 +41,7 @@ __fileno (FILE *fp)
   return _IO_fileno (fp);
 }
 libc_hidden_def (__fileno)
-weak_alias (__fileno, fileno)
+static_weak_alias (__fileno, fileno)
 libc_hidden_weak (fileno)
 
 /* The fileno implementation for libio does not require locking because

diff --git a/libio/getc_u.c b/libio/getc_u.c
index cfd052d7c2ddfedcbe02d17fca29f30cc23123db..ea57c7d049220e2e7bf1e200fa700cb7b9b9a161 100644 (file)
--- a/libio/getc_u.c
+++ b/libio/getc_u.c
@@ -36,6 +36,6 @@ __getc_unlocked (FILE *fp)
   return _IO_getc_unlocked (fp);
 }
 
-weak_alias (__getc_unlocked, getc_unlocked)
+static_weak_alias (__getc_unlocked, getc_unlocked)
 libc_hidden_weak (getc_unlocked)
 weak_alias (__getc_unlocked, fgetc_unlocked)

diff --git a/libio/iofflush.c b/libio/iofflush.c
index 3683c93e155bdebf8128677e7b5b4740e388b8d6..6165493c31537f59b5914015b23c4469d38e2f08 100644 (file)
--- a/libio/iofflush.c
+++ b/libio/iofflush.c
@@ -44,7 +44,7 @@ _IO_fflush (FILE *fp)
 }
 libc_hidden_def (_IO_fflush)
 
-weak_alias (_IO_fflush, fflush)
+static_weak_alias (_IO_fflush, fflush)
 libc_hidden_weak (fflush)
 
 #ifndef _IO_MTSAFE_IO

diff --git a/libio/iofflush_u.c b/libio/iofflush_u.c
index cd9e4afd80398ff7e3a2e73406e58dfd15f4ad34..5690db5a4460b7e0bf964a512bca20104040d763 100644 (file)
--- a/libio/iofflush_u.c
+++ b/libio/iofflush_u.c
@@ -39,5 +39,5 @@ __fflush_unlocked (FILE *fp)
     }
 }
 libc_hidden_def (__fflush_unlocked)
-weak_alias (__fflush_unlocked, fflush_unlocked)
+static_weak_alias (__fflush_unlocked, fflush_unlocked)
 libc_hidden_weak (fflush_unlocked)

diff --git a/libio/iofgets_u.c b/libio/iofgets_u.c
index b9ac6b9640d98a263b80842815a88a4ae4815ab0..86e6ca55b72cff567e0fb02ef1bf664fe709cba2 100644 (file)
--- a/libio/iofgets_u.c
+++ b/libio/iofgets_u.c
@@ -63,5 +63,5 @@ __fgets_unlocked (char *buf, int n, FILE *fp)
   return result;
 }
 libc_hidden_def (__fgets_unlocked)
-weak_alias (__fgets_unlocked, fgets_unlocked)
+static_weak_alias (__fgets_unlocked, fgets_unlocked)
 libc_hidden_weak (fgets_unlocked)

diff --git a/libio/iofputs.c b/libio/iofputs.c
index 0a7e0b4b3ec3bd47437f5f53cca34e241451b2ff..f90830f7516a78cedc3d5ff39545fccc7d712651 100644 (file)
--- a/libio/iofputs.c
+++ b/libio/iofputs.c
@@ -42,7 +42,7 @@ _IO_fputs (const char *str, FILE *fp)
 }
 libc_hidden_def (_IO_fputs)
 
-weak_alias (_IO_fputs, fputs)
+static_weak_alias (_IO_fputs, fputs)
 libc_hidden_weak (fputs)
 
 # ifndef _IO_MTSAFE_IO

diff --git a/libio/iofputs_u.c b/libio/iofputs_u.c
index b283f488e895c7407631c92c0f7ba1911d5fda7a..dc4bd555148b47209c43c251697ae0ffe443d5df 100644 (file)
--- a/libio/iofputs_u.c
+++ b/libio/iofputs_u.c
@@ -39,5 +39,5 @@ __fputs_unlocked (const char *str, FILE *fp)
   return result;
 }
 libc_hidden_def (__fputs_unlocked)
-weak_alias (__fputs_unlocked, fputs_unlocked)
+static_weak_alias (__fputs_unlocked, fputs_unlocked)
 libc_hidden_weak (fputs_unlocked)

diff --git a/libio/iofwrite.c b/libio/iofwrite.c
index 7897c4afaf869b399c13ff163cc9a15c644bbb58..c88c91a4d49f3d51fc3f6851c28ebbb08e247146 100644 (file)
--- a/libio/iofwrite.c
+++ b/libio/iofwrite.c
@@ -79,7 +79,7 @@ _IO_fwrite (const void *buf, size_t size, size_t count, FILE *fp)
 libc_hidden_def (_IO_fwrite)
 
 # include <stdio.h>
-weak_alias (_IO_fwrite, fwrite)
+static_weak_alias (_IO_fwrite, fwrite)
 libc_hidden_weak (fwrite)
 # ifndef _IO_MTSAFE_IO
 weak_alias (_IO_fwrite, fwrite_unlocked)

diff --git a/libio/ioputs.c b/libio/ioputs.c
index 8baf5021857f07a66ef7fbf8443dc0a7d64c6e46..3e57e319d06b586c7baefd28e07cef53188ce1cc 100644 (file)
--- a/libio/ioputs.c
+++ b/libio/ioputs.c
@@ -45,5 +45,5 @@ _IO_puts (const char *str)
   return result;
 }
 
-weak_alias (_IO_puts, puts)
+static_weak_alias (_IO_puts, puts)
 libc_hidden_def (_IO_puts)

diff --git a/libio/putc_u.c b/libio/putc_u.c
index 609ef42b6a795a9e8d83f3a32b0e08e8dee19484..d8f1562eb41563bf32cbb608e11eeddea5ef0cba 100644 (file)
--- a/libio/putc_u.c
+++ b/libio/putc_u.c
@@ -26,5 +26,5 @@ __putc_unlocked (int c, FILE *fp)
   CHECK_FILE (fp, EOF);
   return _IO_putc_unlocked (c, fp);
 }
-weak_alias (__putc_unlocked, putc_unlocked)
+static_weak_alias (__putc_unlocked, putc_unlocked)
 libc_hidden_weak (putc_unlocked)

diff --git a/login/Makefile b/login/Makefile
index d6a9a6975e7f831ad8f6ec2b79e23703b0a60d74..e6b5a1fff45d1c1c98b8ac8a0072a39886687adb 100644 (file)
--- a/login/Makefile
+++ b/login/Makefile
@@ -110,7 +110,6 @@ endif # $(have-GLIBC_2.33)
 include ../Rules
 
 CFLAGS-getpt.c += -fexceptions
-CFLAGS-getlogin_r.c += $(config-cflags-wno-ignored-attributes)
 
 # Exclude fortified routines from being built with _FORTIFY_SOURCE
 routines_no_fortify += \

diff --git a/misc/Makefile b/misc/Makefile
index e792d94ebd5d871de031e45167d1a129e6b7be9b..d6514ca5d310a61919e5170cf51a9a35f9b732b1 100644 (file)
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -341,8 +341,6 @@ CFLAGS-tst-tsearch.c += $(stack-align-test-flags)
 CFLAGS-msync.c += -fexceptions -fasynchronous-unwind-tables
 CFLAGS-fdatasync.c += -fexceptions -fasynchronous-unwind-tables
 CFLAGS-fsync.c += -fexceptions -fasynchronous-unwind-tables
-CFLAGS-makedev.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-mmap64.c += $(config-cflags-wno-ignored-attributes)
 
 # Called during static library initialization, so turn stack-protection
 # off for non-shared builds.

diff --git a/misc/makedev.c b/misc/makedev.c
index e7a0029f1def30ee075df7865ad69ce9566f27a5..3ad6dcb0aa621afd2f85fc425322e9e7859017ed 100644 (file)
--- a/misc/makedev.c
+++ b/misc/makedev.c
@@ -26,11 +26,11 @@
   rtype __gnu_dev_##name proto
 
 __SYSMACROS_DEFINE_MAJOR(OUT_OF_LINE_IMPL_TEMPL)
-weak_alias (__gnu_dev_major, gnu_dev_major)
+static_weak_alias (__gnu_dev_major, gnu_dev_major)
 libc_hidden_weak (gnu_dev_major)
 __SYSMACROS_DEFINE_MINOR(OUT_OF_LINE_IMPL_TEMPL)
-weak_alias (__gnu_dev_minor, gnu_dev_minor)
+static_weak_alias (__gnu_dev_minor, gnu_dev_minor)
 libc_hidden_weak (gnu_dev_minor)
 __SYSMACROS_DEFINE_MAKEDEV(OUT_OF_LINE_IMPL_TEMPL)
-weak_alias (__gnu_dev_makedev, gnu_dev_makedev)
+static_weak_alias (__gnu_dev_makedev, gnu_dev_makedev)
 libc_hidden_weak (gnu_dev_makedev)

diff --git a/posix/Makefile b/posix/Makefile
index f6421e5379cb3788cceac954e1ca7ed10d88b379..062e7fdc203b0900d51a9979da5b9849027ecb70 100644 (file)
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -568,9 +568,9 @@ $(objpfx)config-name.h: $(..)scripts/config-uname.sh $(common-objpfx)config.make
 
 CFLAGS-pause.c += -fexceptions -fasynchronous-unwind-tables
 CFLAGS-pread.c += -fexceptions -fasynchronous-unwind-tables
-CFLAGS-pread64.c += -fexceptions -fasynchronous-unwind-tables $(config-cflags-wno-ignored-attributes)
+CFLAGS-pread64.c += -fexceptions -fasynchronous-unwind-tables
 CFLAGS-pwrite.c += -fexceptions -fasynchronous-unwind-tables
-CFLAGS-pwrite64.c += -fexceptions -fasynchronous-unwind-tables $(config-cflags-wno-ignored-attributes)
+CFLAGS-pwrite64.c += -fexceptions -fasynchronous-unwind-tables
 CFLAGS-sleep.c += -fexceptions
 CFLAGS-wait.c += -fexceptions -fasynchronous-unwind-tables
 CFLAGS-waitid.c += -fexceptions -fasynchronous-unwind-tables
@@ -599,7 +599,7 @@ CFLAGS-execl.os = -fomit-frame-pointer
 CFLAGS-execvp.os = -fomit-frame-pointer
 CFLAGS-execlp.os = -fomit-frame-pointer
 CFLAGS-nanosleep.c += -fexceptions -fasynchronous-unwind-tables
-CFLAGS-fork.c = $(libio-mtsafe) $(config-cflags-wno-ignored-attributes)
+CFLAGS-fork.c = $(libio-mtsafe)
 
 tstgetopt-ARGS = -a -b -cfoobar --required foobar --optional=bazbug \
                --none random --col --color --colour

diff --git a/posix/confstr.c b/posix/confstr.c
index 415905b269f7a40b1c300708f8c740efb888a468..1f41e14193b1dd7fe748b76956fd5f13b8472c35 100644 (file)
--- a/posix/confstr.c
+++ b/posix/confstr.c
@@ -291,4 +291,4 @@ __confstr (int name, char *buf, size_t len)
 }
 libc_hidden_def (__confstr)
 libc_hidden_def (confstr)
-weak_alias (__confstr, confstr)
+static_weak_alias (__confstr, confstr)

diff --git a/posix/fork.c b/posix/fork.c
index 011e92fc1da9d2a3c0bf43364d40b7a038ca96e5..dfd413051ecdb890643f2022a496b76c26e2a7f5 100644 (file)
--- a/posix/fork.c
+++ b/posix/fork.c
@@ -137,6 +137,6 @@ __libc_fork (void)
 
   return pid;
 }
-weak_alias (__libc_fork, __fork)
+strong_alias (__libc_fork, __fork)
 libc_hidden_def (__fork)
 weak_alias (__libc_fork, fork)

diff --git a/resolv/Makefile b/resolv/Makefile
index ebb06cb14aa689c9720be58d4fc6b6ea629f2691..d294c3f3fcae8bd4a3c3cf40047e5db89f4008f8 100644 (file)
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -249,7 +249,6 @@ LOCALES := en_US.UTF-8 en_US.ISO-8859-1
 include ../gen-locales.mk
 
 CFLAGS-res_hconf.c += -fexceptions
-CFLAGS-inet_pton.c += $(config-cflags-wno-ignored-attributes)
 
 # The DNS NSS modules needs the resolver.
 $(objpfx)libnss_dns.so: $(objpfx)libresolv.so

diff --git a/resolv/inet_pton.c b/resolv/inet_pton.c
index 5307a5b243a9ad7e70de65fc6b73c98d293343e9..901bc3fb545b0bc0eda61b2685a6e2cb8657ee06 100644 (file)
--- a/resolv/inet_pton.c
+++ b/resolv/inet_pton.c
@@ -43,5 +43,5 @@ __inet_pton (int af, const char *src, void *dst)
   return __inet_pton_length (af, src, strlen (src), dst);
 }
 libc_hidden_def (__inet_pton)
-weak_alias (__inet_pton, inet_pton)
+static_weak_alias (__inet_pton, inet_pton)
 libc_hidden_weak (inet_pton)

diff --git a/resource/Makefile b/resource/Makefile
index 9b4998107ffaa292a80664c47b3cf88601422a5f..55982ebeed13345ea85a29b66939d79e1aca0f2d 100644 (file)
--- a/resource/Makefile
+++ b/resource/Makefile
@@ -32,6 +32,3 @@ tests := \
 
 
 include ../Rules
-
-CFLAGS-getrlimit64.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-getrlimit.c += $(config-cflags-wno-ignored-attributes)

diff --git a/socket/Makefile b/socket/Makefile
index 70fd4138b9339faebf1e07ab437b99d3e25d1bb9..bc3957968209933d14f97daf655053e88b581a44 100644 (file)
--- a/socket/Makefile
+++ b/socket/Makefile
@@ -87,11 +87,11 @@ aux  := sa_len
 
 include ../Rules
 
-CFLAGS-recv.c += -fexceptions -fasynchronous-unwind-tables $(config-cflags-wno-ignored-attributes)
+CFLAGS-recv.c += -fexceptions -fasynchronous-unwind-tables
 CFLAGS-recvfrom.c += -fexceptions -fasynchronous-unwind-tables
 CFLAGS-sendto.c += -fexceptions -fasynchronous-unwind-tables
 CFLAGS-recvmsg.c += -fexceptions -fasynchronous-unwind-tables
-CFLAGS-sendmsg.c += -fexceptions -fasynchronous-unwind-tables $(config-cflags-wno-ignored-attributes)
-CFLAGS-send.c += -fexceptions -fasynchronous-unwind-tables $(config-cflags-wno-ignored-attributes)
-CFLAGS-connect.c += -fexceptions -fasynchronous-unwind-tables $(config-cflags-wno-ignored-attributes)
-CFLAGS-accept.c += -fexceptions -fasynchronous-unwind-tables $(config-cflags-wno-ignored-attributes)
+CFLAGS-sendmsg.c += -fexceptions -fasynchronous-unwind-tables
+CFLAGS-send.c += -fexceptions -fasynchronous-unwind-tables
+CFLAGS-connect.c += -fexceptions -fasynchronous-unwind-tables
+CFLAGS-accept.c += -fexceptions -fasynchronous-unwind-tables

diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index da337cb4e18846661d6f74d840976ab4f2a47d08..806e4cec3a307e8f7472d4cfd8c2ddbc472b4a99 100644 (file)
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -717,8 +717,6 @@ CFLAGS-isoc23_vscanf.c += -fexceptions
 CFLAGS-isoc23_fscanf.c += -fexceptions
 CFLAGS-isoc23_scanf.c += -fexceptions
 
-CFLAGS-dprintf.c += $(config-cflags-wno-ignored-attributes)
-
 # Called during static library initialization, so turn stack-protection
 # off for non-shared builds.
 CFLAGS-_itoa.o = $(no-stack-protector)

diff --git a/stdlib/Makefile b/stdlib/Makefile
index 4af922fc2ba6392e7fbdc15689ae52a5f1c64cd2..f10bcf3e053228f8729274197c9a2ca8ae0578d5 100644 (file)
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -535,18 +535,6 @@ CFLAGS-strfromd.c += $(libio-mtsafe)
 CFLAGS-strfromf.c += $(libio-mtsafe)
 CFLAGS-strfroml.c += $(libio-mtsafe)
 
-CFLAGS-strtol.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-strtoul.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-strtoll.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-strtoull.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-strtof.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-strtof_l.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-strtod.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-strtod_l.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-strtold.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-strtold_l.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-secure-getenv.c += $(config-cflags-wno-ignored-attributes)
-
 CFLAGS-tst-bsearch.c += $(stack-align-test-flags)
 CFLAGS-tst-qsort.c += $(stack-align-test-flags)
 CFLAGS-tst-makecontext.c += -funwind-tables

diff --git a/stdlib/secure-getenv.c b/stdlib/secure-getenv.c
index a2408a304f98a7b4b137dfdcfc9a0f7809d86846..b16efcb40eb83403bace8d499cad9860c3f4bb8a 100644 (file)
--- a/stdlib/secure-getenv.c
+++ b/stdlib/secure-getenv.c
@@ -29,7 +29,7 @@ __libc_secure_getenv (const char *name)
   return __libc_enable_secure ? NULL : getenv (name);
 }
 weak_alias (__libc_secure_getenv, secure_getenv)
-libc_hidden_weak (__libc_secure_getenv)
+libc_hidden_def (__libc_secure_getenv)
 
 #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_17)
 compat_symbol (libc, __libc_secure_getenv, __secure_getenv, GLIBC_2_0);

diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c
index d00a336589d0b66a21b3e676f6e095030f63a46d..3988049f7ee18090a1bd06f99b5cdafeb1e13c5b 100644 (file)
--- a/stdlib/strtod_l.c
+++ b/stdlib/strtod_l.c
@@ -1785,7 +1785,7 @@ __STRTOF (const STRING_TYPE *nptr, STRING_TYPE **endptr, locale_t loc)
 libc_hidden_def (__STRTOF)
 libc_hidden_ver (__STRTOF, STRTOF)
 #endif
-weak_alias (__STRTOF, STRTOF)
+static_weak_alias (__STRTOF, STRTOF)
 
 #ifdef LONG_DOUBLE_COMPAT
 # if LONG_DOUBLE_COMPAT(libc, GLIBC_2_1)
@@ -1809,18 +1809,18 @@ compat_symbol (libc, strtod_l, strtold_l, GLIBC_2_3);
 #  undef strtof64_l
 #  undef wcstof64_l
 #  ifdef USE_WIDE_CHAR
-weak_alias (wcstod_l, wcstof64_l)
+weak_alias (__wcstod_l, wcstof64_l)
 #  else
-weak_alias (strtod_l, strtof64_l)
+weak_alias (__strtod_l, strtof64_l)
 #  endif
 # endif
 # if __HAVE_FLOAT32X && !__HAVE_DISTINCT_FLOAT32X
 #  undef strtof32x_l
 #  undef wcstof32x_l
 #  ifdef USE_WIDE_CHAR
-weak_alias (wcstod_l, wcstof32x_l)
+weak_alias (__wcstod_l, wcstof32x_l)
 #  else
-weak_alias (strtod_l, strtof32x_l)
+weak_alias (__strtod_l, strtof32x_l)
 #  endif
 # endif
 #endif

diff --git a/stdlib/strtof_l.c b/stdlib/strtof_l.c
index 2ec5f576cfb7cbeb462e9d71e8823bfadbaf5001..966db79725b6bfe72311a6fd13377bbfdcd8f15c 100644 (file)
--- a/stdlib/strtof_l.c
+++ b/stdlib/strtof_l.c
@@ -47,8 +47,8 @@ extern float ____strtof_l_internal (const char *, char **, int, locale_t);
 # undef strtof32_l
 # undef wcstof32_l
 # ifdef USE_WIDE_CHAR
-weak_alias (wcstof_l, wcstof32_l)
+weak_alias (__wcstof_l, wcstof32_l)
 # else
-weak_alias (strtof_l, strtof32_l)
+weak_alias (__strtof_l, strtof32_l)
 # endif
 #endif

diff --git a/stdlib/strtol.c b/stdlib/strtol.c
index 155bfe166d42a98356a0b0e8dcb8b0c2d118864f..5b4e9d1cd9ba3df64103f2676bae7eae253a32fc 100644 (file)
--- a/stdlib/strtol.c
+++ b/stdlib/strtol.c
@@ -117,7 +117,7 @@ __strtol (const STRING_TYPE *nptr, STRING_TYPE **endptr, int base)
   return INTERNAL (__strtol_l) (nptr, endptr, base, 0, false,
                                _NL_CURRENT_LOCALE);
 }
-weak_alias (__strtol, strtol)
+static_weak_alias (__strtol, strtol)
 libc_hidden_weak (strtol)
 
 INT

diff --git a/string/Makefile b/string/Makefile
index d842ae04570b88750c7f898b1c9bad04e1c41796..2f30e66df581713750eaab7ba07a4d92720f0bc3 100644 (file)
--- a/string/Makefile
+++ b/string/Makefile
@@ -285,15 +285,6 @@ CFLAGS-wordcopy.c += $(no-stack-protector)
 CFLAGS-strncmp.c += $(no-stack-protector)
 CFLAGS-memset.c += $(no-stack-protector)
 
-CFLAGS-argz-next.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-basename.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-ffs.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-memmem.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-memchr.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-mempcpy.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-stpcpy.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-strnlen.c += $(config-cflags-wno-ignored-attributes)
-
 ifeq ($(run-built-tests),yes)
 $(objpfx)tst-svc-cmp.out: tst-svc.expect $(objpfx)tst-svc.out
        cmp $^ > $@; \

diff --git a/string/argz-next.c b/string/argz-next.c
index aac67a9d1c52e00b9bd87e3e6e49fa34205ac059..be567cf5736ef285223e3c0b537d4fff294ad254 100644 (file)
--- a/string/argz-next.c
+++ b/string/argz-next.c
@@ -36,5 +36,5 @@ __argz_next (const char *argz, size_t argz_len, const char *entry)
       return NULL;
 }
 libc_hidden_def (__argz_next)
-weak_alias (__argz_next, argz_next)
+static_weak_alias (__argz_next, argz_next)
 libc_hidden_weak (argz_next)

diff --git a/string/basename.c b/string/basename.c
index dd2c8182dbc5df71b89100aab33ae98ff4e176ff..ca45ca8ae9243d1824cc6ad49725c32faba6d4af 100644 (file)
--- a/string/basename.c
+++ b/string/basename.c
@@ -25,5 +25,5 @@ __basename (const char *filename)
   return p ? p + 1 : (char *) filename;
 }
 libc_hidden_def (__basename)
-weak_alias (__basename, basename)
+static_weak_alias (__basename, basename)
 libc_hidden_weak (basename)

diff --git a/string/ffs.c b/string/ffs.c
index a2aa5b1242d3cf82b56a635dca5d29030ff714d2..7010059833e7356cf73d2a08469c3b5b44577ed4 100644 (file)
--- a/string/ffs.c
+++ b/string/ffs.c
@@ -47,7 +47,7 @@ __ffs (int i)
   return table[x >> a] + a;
 #endif
 }
-weak_alias (__ffs, ffs)
+static_weak_alias (__ffs, ffs)
 libc_hidden_def (__ffs)
 libc_hidden_builtin_def (ffs)
 

diff --git a/string/ffsll.c b/string/ffsll.c
index 1b01d8fb122ea39cd0cf7aaa974b18a8aeea0c64..6794de1c2a5d7e79902a53b194b21d1b5648354e 100644 (file)
--- a/string/ffsll.c
+++ b/string/ffsll.c
@@ -37,9 +37,9 @@ __ffsll (long long int i)
     return 32 + ffs (i >> 32);
 #endif
 }
-weak_alias (__ffsll, ffsll)
+static_weak_alias (__ffsll, ffsll)
 
 #if ULONG_MAX != UINT_MAX
 #undef ffsl
-weak_alias (ffsll, ffsl)
+static_weak_alias (__ffsll, ffsl)
 #endif

diff --git a/string/memmem.c b/string/memmem.c
index 8d9b7d196e069c25182536bb61ead7820e53484d..febb50b605e88b4f48936a74f323ae7bff87ff44 100644 (file)
--- a/string/memmem.c
+++ b/string/memmem.c
@@ -125,5 +125,5 @@ __memmem (const void *haystack, size_t hs_len,
   return NULL;
 }
 libc_hidden_def (__memmem)
-weak_alias (__memmem, memmem)
+static_weak_alias (__memmem, memmem)
 libc_hidden_weak (memmem)

diff --git a/string/mempcpy.c b/string/mempcpy.c
index efbc9d42f156df5b4b177dd9ee424bf6ba2d5385..1199f124edec027a1945d5f6c99386024409a939 100644 (file)
--- a/string/mempcpy.c
+++ b/string/mempcpy.c
@@ -35,5 +35,5 @@ MEMPCPY (void *dest, const void *src, size_t len)
   return memcpy (dest, src, len) + len;
 }
 libc_hidden_def (__mempcpy)
-weak_alias (__mempcpy, mempcpy)
+static_weak_alias (__mempcpy, mempcpy)
 libc_hidden_builtin_def (mempcpy)

diff --git a/string/test-memchr.c b/string/test-memchr.c
index aaf9a6db2986f62c736daf246ab65e45b3a738d6..fbfcd4d17d447dd687d5332d0c4fc98066c53ce0 100644 (file)
--- a/string/test-memchr.c
+++ b/string/test-memchr.c
@@ -47,8 +47,8 @@ IMPL (MEMCHR, 1)
 
 /* Also check the generic implementation.  */
 #undef MEMCHR
-#undef weak_alias
-#define weak_alias(a, b)
+#undef static_weak_alias
+#define static_weak_alias(a, b)
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(a)
 #undef libc_hidden_def

diff --git a/string/test-strchr.c b/string/test-strchr.c
index 765d69ecc2100e7aa8ed12fb812a17fc6af5959f..8ea4335ac099396a412eb0554903e11c0fa9e8ee 100644 (file)
--- a/string/test-strchr.c
+++ b/string/test-strchr.c
@@ -74,8 +74,8 @@ IMPL (STRCHR, 1)
 
 /* Also check the generic implementation.  */
 #undef STRCHR
-#undef weak_alias
-#define weak_alias(a, b)
+#undef static_weak_alias
+#define static_weak_alias(a, b)
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(a)
 #undef libc_hidden_def

diff --git a/string/test-strlen.c b/string/test-strlen.c
index 03a8969e54e6e61913df06d85e112faf56536fbb..2b85fc421a0d79fab7bd1b41658d5bf12b4c3ee5 100644 (file)
--- a/string/test-strlen.c
+++ b/string/test-strlen.c
@@ -41,8 +41,8 @@ IMPL (STRLEN, 1)
 
 /* Also check the generic implementation.  */
 #undef STRLEN
-#undef weak_alias
-#define weak_alias(a, b)
+#undef static_weak_alias
+#define static_weak_alias(a, b)
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(a)
 #ifndef WIDE

diff --git a/string/test-strnlen.c b/string/test-strnlen.c
index acb1c055fc1eba776a50700401365f2a00007aa3..29d291e66fbe065512f3c19e6300473e19b55daa 100644 (file)
--- a/string/test-strnlen.c
+++ b/string/test-strnlen.c
@@ -47,7 +47,7 @@ typedef size_t (*proto_t) (const CHAR *, size_t);
 #undef STRNLEN
 #ifndef WIDE
 # define MEMCHR __memchr_default
-# define weak_alias(a, b)
+# define static_weak_alias(a, b)
 # define libc_hidden_def(a)
 # define libc_hidden_builtin_def(a)
 # include "string/memchr.c"
@@ -58,7 +58,7 @@ typedef size_t (*proto_t) (const CHAR *, size_t);
 IMPL (__strnlen_default, 1)
 #else
 # define WMEMCHR __wmemchr_default
-# define weak_alias(a, b)
+# define static_weak_alias(a, b)
 # define libc_hidden_def(a)
 # define libc_hidden_weak(a)
 # include "wcsmbs/wmemchr.c"

diff --git a/sysdeps/aarch64/Makefile b/sysdeps/aarch64/Makefile
index 9479fb96793d8a5a6e0fc3109f366d4d587431e4..2de7a4cfe982adf151664ccd9f0f8ad4c401132d 100644 (file)
--- a/sysdeps/aarch64/Makefile
+++ b/sysdeps/aarch64/Makefile
@@ -66,7 +66,6 @@ endif
 
 ifeq ($(subdir),math)
 CPPFLAGS += -I../soft-fp
-CFLAGS-feupdateenv.c += $(config-cflags-wno-ignored-attributes)
 endif
 
 ifeq ($(subdir),misc)

diff --git a/sysdeps/aarch64/fpu/fclrexcpt.c b/sysdeps/aarch64/fpu/fclrexcpt.c
index 21eb731e2921b0ddf567a1aad6a37450ae10af73..9f6fc8dd03cfd09718111d901b2915db0165ae2c 100644 (file)
--- a/sysdeps/aarch64/fpu/fclrexcpt.c
+++ b/sysdeps/aarch64/fpu/fclrexcpt.c
@@ -35,6 +35,6 @@ __feclearexcept (int excepts)
 
   return 0;
 }
-weak_alias (__feclearexcept, feclearexcept)
+static_weak_alias (__feclearexcept, feclearexcept)
 libm_hidden_def (__feclearexcept)
 libm_hidden_def (feclearexcept)

diff --git a/sysdeps/aarch64/fpu/fegetenv.c b/sysdeps/aarch64/fpu/fegetenv.c
index eb8117c61d863f92b8773ba2e020ae7cefa46964..76f68e77ef5f326f19569370b3f557a8d0ce3bd6 100644 (file)
--- a/sysdeps/aarch64/fpu/fegetenv.c
+++ b/sysdeps/aarch64/fpu/fegetenv.c
@@ -31,5 +31,5 @@ __fegetenv (fenv_t *envp)
   return 0;
 }
 libm_hidden_def (__fegetenv)
-weak_alias (__fegetenv, fegetenv)
+static_weak_alias (__fegetenv, fegetenv)
 libm_hidden_weak (fegetenv)

diff --git a/sysdeps/aarch64/fpu/fegetround.c b/sysdeps/aarch64/fpu/fegetround.c
index d6758c9879a646396ec42e63c4e55e1adb02c138..f5db20165fe67ba38c1069680f8f12c41db6183c 100644 (file)
--- a/sysdeps/aarch64/fpu/fegetround.c
+++ b/sysdeps/aarch64/fpu/fegetround.c
@@ -25,5 +25,5 @@ __fegetround (void)
   return get_rounding_mode ();
 }
 libm_hidden_def (__fegetround)
-weak_alias (__fegetround, fegetround)
+static_weak_alias (__fegetround, fegetround)
 libm_hidden_weak (fegetround)

diff --git a/sysdeps/aarch64/fpu/feholdexcpt.c b/sysdeps/aarch64/fpu/feholdexcpt.c
index 79ae5494c67ed1c4ca6d519741d99008ce41b798..f1d6ef54e79c9858e086d638e2220c21b8a20fab 100644 (file)
--- a/sysdeps/aarch64/fpu/feholdexcpt.c
+++ b/sysdeps/aarch64/fpu/feholdexcpt.c
@@ -26,5 +26,5 @@ __feholdexcept (fenv_t *envp)
   return 0;
 }
 libm_hidden_def (__feholdexcept)
-weak_alias (__feholdexcept, feholdexcept)
+static_weak_alias (__feholdexcept, feholdexcept)
 libm_hidden_weak (feholdexcept)

diff --git a/sysdeps/aarch64/fpu/fesetenv.c b/sysdeps/aarch64/fpu/fesetenv.c
index 6a0df368c85d6551320ef3bd3608de791955bb3d..9c1d2114d00b9c0600bdc482ca4f4f89d0d2969b 100644 (file)
--- a/sysdeps/aarch64/fpu/fesetenv.c
+++ b/sysdeps/aarch64/fpu/fesetenv.c
@@ -74,5 +74,5 @@ __fesetenv (const fenv_t *envp)
   return 0;
 }
 libm_hidden_def (__fesetenv)
-weak_alias (__fesetenv, fesetenv)
+static_weak_alias (__fesetenv, fesetenv)
 libm_hidden_weak (fesetenv)

diff --git a/sysdeps/aarch64/fpu/fesetround.c b/sysdeps/aarch64/fpu/fesetround.c
index cd0c3bcfed8b0658102115777063ff8bf9bc1fcc..f00437ab5b247115906f1e85d385fa0a0ec3131d 100644 (file)
--- a/sysdeps/aarch64/fpu/fesetround.c
+++ b/sysdeps/aarch64/fpu/fesetround.c
@@ -30,5 +30,5 @@ __fesetround (int round)
   return 0;
 }
 libm_hidden_def (__fesetround)
-weak_alias (__fesetround, fesetround)
+static_weak_alias (__fesetround, fesetround)
 libm_hidden_weak (fesetround)

diff --git a/sysdeps/aarch64/fpu/feupdateenv.c b/sysdeps/aarch64/fpu/feupdateenv.c
index 4690e84f21b9e4114bdb707d384f0276fd865d88..6117a464430b07eb2ebd935d3c032b9bab71bc96 100644 (file)
--- a/sysdeps/aarch64/fpu/feupdateenv.c
+++ b/sysdeps/aarch64/fpu/feupdateenv.c
@@ -85,5 +85,5 @@ __feupdateenv (const fenv_t *envp)
   return 0;
 }
 libm_hidden_def (__feupdateenv)
-weak_alias (__feupdateenv, feupdateenv)
+static_weak_alias (__feupdateenv, feupdateenv)
 libm_hidden_weak (feupdateenv)

diff --git a/sysdeps/aarch64/fpu/fraiseexcpt.c b/sysdeps/aarch64/fpu/fraiseexcpt.c
index 518a6eb3210cc8b4b48a526e08bdd1ae1e672780..9440339c93fd874db2e6af59bd74a69e30d7865f 100644 (file)
--- a/sysdeps/aarch64/fpu/fraiseexcpt.c
+++ b/sysdeps/aarch64/fpu/fraiseexcpt.c
@@ -90,5 +90,5 @@ __feraiseexcept (int excepts)
   return 0;
 }
 libm_hidden_def (__feraiseexcept)
-weak_alias (__feraiseexcept, feraiseexcept)
+static_weak_alias (__feraiseexcept, feraiseexcept)
 libm_hidden_weak (feraiseexcept)

diff --git a/sysdeps/aarch64/fpu/ftestexcept.c b/sysdeps/aarch64/fpu/ftestexcept.c
index f057616f7f83f85a37dee64361101a7e326df10c..46150510da80556c4224edfde7fda8f81080c5f1 100644 (file)
--- a/sysdeps/aarch64/fpu/ftestexcept.c
+++ b/sysdeps/aarch64/fpu/ftestexcept.c
@@ -25,5 +25,5 @@ __fetestexcept (int excepts)
   return libc_fetestexcept_aarch64 (excepts);
 }
 libm_hidden_def (__fetestexcept)
-weak_alias (__fetestexcept, fetestexcept)
+static_weak_alias (__fetestexcept, fetestexcept)
 libm_hidden_def (fetestexcept)

diff --git a/sysdeps/arm/Makefile b/sysdeps/arm/Makefile
index 9c4fd6b236967d91f8300a9b61aa84d58083c694..d08dade3c5befde9cbe38b4fdc63ba55df3e055d 100644 (file)
--- a/sysdeps/arm/Makefile
+++ b/sysdeps/arm/Makefile
@@ -54,10 +54,6 @@ ifeq ($(subdir),gmon)
 sysdep_routines += arm-mcount
 endif
 
-ifeq ($(subdir),math)
-CFLAGS-feupdateenv.c += $(config-cflags-wno-ignored-attributes)
-endif
-
 ifeq ($(subdir),rt)
 librt-sysdep_routines += rt-aeabi_unwind_cpp_pr1 rt-arm-unwind-resume
 librt-shared-only-routines += rt-aeabi_unwind_cpp_pr1 rt-arm-unwind-resume

diff --git a/sysdeps/generic/math_ldbl_opt.h b/sysdeps/generic/math_ldbl_opt.h
index fbd2c82e2f5952a075c642eba9ecf6fb468da802..0a14c723ca1086fccd4fbefd0fcb6e84cc576261 100644 (file)
--- a/sysdeps/generic/math_ldbl_opt.h
+++ b/sysdeps/generic/math_ldbl_opt.h
@@ -12,6 +12,6 @@
 #define long_double_symbol(lib, local, symbol)
 #define ldbl_hidden_def(local, name) libc_hidden_def (name)
 #define ldbl_strong_alias(name, aliasname) strong_alias (name, aliasname)
-#define ldbl_weak_alias(name, aliasname) weak_alias (name, aliasname)
+#define ldbl_weak_alias(name, aliasname) static_weak_alias (name, aliasname)
 #define ldbl_compat_symbol(lib, local, symbol, version) \
   compat_symbol (lib, local, symbol, version)

diff --git a/sysdeps/i386/i686/multiarch/wcschr-c.c b/sysdeps/i386/i686/multiarch/wcschr-c.c
index 38d41d04de075c191d73e705579928a75ff15a95..f99a34862416ce62f7cf9e6ee6ea943643e5497b 100644 (file)
--- a/sysdeps/i386/i686/multiarch/wcschr-c.c
+++ b/sysdeps/i386/i686/multiarch/wcschr-c.c
@@ -4,8 +4,8 @@
 # undef libc_hidden_weak
 # define libc_hidden_weak(name)
 
-# undef weak_alias
-# define weak_alias(name,alias)
+# undef static_weak_alias
+# define static_weak_alias(name,alias)
 
 # ifdef SHARED
 #  undef libc_hidden_def

diff --git a/sysdeps/ieee754/float128/s_fabsf128.c b/sysdeps/ieee754/float128/s_fabsf128.c
index 79ba47c3fd74da61ea82c2a4b33d2ded2da9f450..2c1f277653ee184267f5e469cb6aee38f67f249f 100644 (file)
--- a/sysdeps/ieee754/float128/s_fabsf128.c
+++ b/sysdeps/ieee754/float128/s_fabsf128.c
@@ -1,2 +1,8 @@
 #include <float128_private.h>
+#ifndef __USE_EXTERN_INLINES
+# undef libm_alias_float128_r
+# define libm_alias_float128_r(from, to, r)                    \
+  static_weak_alias (from ## f128 ## r, to ## f128 ## r);      \
+  libm_alias_float128_other_r (from, to, r)
+#endif
 #include "../ldbl-128/s_fabsl.c"

diff --git a/sysdeps/ieee754/ldbl-128/strtold_l.c b/sysdeps/ieee754/ldbl-128/strtold_l.c
index 64f14c11c7da33aac60c2aaa746aaf9dded761aa..3366040c77e0611758d475b67949964239f9fb5f 100644 (file)
--- a/sysdeps/ieee754/ldbl-128/strtold_l.c
+++ b/sysdeps/ieee754/ldbl-128/strtold_l.c
@@ -50,9 +50,9 @@
 # undef strtof128_l
 # undef wcstof128_l
 # ifdef USE_WIDE_CHAR
-weak_alias (wcstold_l, wcstof128_l)
+weak_alias (__wcstold_l, wcstof128_l)
 # else
-weak_alias (strtold_l, strtof128_l)
+weak_alias (__strtold_l, strtof128_l)
 # endif
 #endif
 
@@ -60,8 +60,8 @@ weak_alias (strtold_l, strtof128_l)
 # undef strtof64x_l
 # undef wcstof64x_l
 # ifdef USE_WIDE_CHAR
-weak_alias (wcstold_l, wcstof64x_l)
+weak_alias (__wcstold_l, wcstof64x_l)
 # else
-weak_alias (strtold_l, strtof64x_l)
+weak_alias (__strtold_l, strtof64x_l)
 # endif
 #endif

diff --git a/sysdeps/ieee754/ldbl-96/strtold_l.c b/sysdeps/ieee754/ldbl-96/strtold_l.c
index c721ddc69608a635babd6c37622d3cd4e801ca92..ae6f87b44c5e38af4674a8017dd20987d2cf9e2b 100644 (file)
--- a/sysdeps/ieee754/ldbl-96/strtold_l.c
+++ b/sysdeps/ieee754/ldbl-96/strtold_l.c
@@ -45,8 +45,8 @@
 # undef strtof64x_l
 # undef wcstof64x_l
 # ifdef USE_WIDE_CHAR
-weak_alias (wcstold_l, wcstof64x_l)
+static_weak_alias (__wcstold_l, wcstof64x_l)
 # else
-weak_alias (strtold_l, strtof64x_l)
+static_weak_alias (__strtold_l, strtof64x_l)
 # endif
 #endif

diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy-ppc32.c b/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy-ppc32.c
index d0bfe0da434fb84220a70176acde47bcbae05498..7ca044c213de27330b83454492f0fc21a0366835 100644 (file)
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy-ppc32.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy-ppc32.c
@@ -20,8 +20,8 @@
 
 #undef libc_hidden_def
 #define libc_hidden_def(name)
-#undef weak_alias
-#define weak_alias(a, b)
+#undef static_weak_alias
+#define static_weak_alias(a, b)
 
 #if defined SHARED
 # undef libc_hidden_builtin_def

diff --git a/sysdeps/s390/wcschr-c.c b/sysdeps/s390/wcschr-c.c
index 18d6b329c20c09b06d031b3a68163edf3686838d..404fcbbbb637283ede9964d0525498cd769ef377 100644 (file)
--- a/sysdeps/s390/wcschr-c.c
+++ b/sysdeps/s390/wcschr-c.c
@@ -22,8 +22,8 @@
 # if HAVE_WCSCHR_IFUNC || HAVE_WCSCHR_Z13
 #  define WCSCHR WCSCHR_C
 
-#  undef weak_alias
-#  define weak_alias(name, alias)
+#  undef static_weak_alias
+#  define static_weak_alias(name, alias)
 
 #  if defined SHARED && IS_IN (libc)
 #   undef libc_hidden_weak

diff --git a/sysdeps/unix/sysv/linux/accept.c b/sysdeps/unix/sysv/linux/accept.c
index 410b1c0bcb1e20e6fde9ac460e390b9c8d4476dc..1cf84ff6ecdcaded90be44dfe0552fe22ef0a762 100644 (file)
--- a/sysdeps/unix/sysv/linux/accept.c
+++ b/sysdeps/unix/sysv/linux/accept.c
@@ -30,5 +30,5 @@ __libc_accept (int fd, __SOCKADDR_ARG addr, socklen_t *len)
   return SOCKETCALL_CANCEL (accept, fd, addr.__sockaddr__, len);
 #endif
 }
-weak_alias (__libc_accept, accept)
+static_weak_alias (__libc_accept, accept)
 libc_hidden_def (accept)

diff --git a/sysdeps/unix/sysv/linux/connect.c b/sysdeps/unix/sysv/linux/connect.c
index d60dc2ef11e1cc738ef08957fa2d84f41d78da81..dab24198fbd652c82b1683c18d403a309cca6692 100644 (file)
--- a/sysdeps/unix/sysv/linux/connect.c
+++ b/sysdeps/unix/sysv/linux/connect.c
@@ -28,6 +28,6 @@ __libc_connect (int fd, __CONST_SOCKADDR_ARG addr, socklen_t len)
   return SOCKETCALL_CANCEL (connect, fd, addr.__sockaddr__, len);
 #endif
 }
-weak_alias (__libc_connect, connect)
-weak_alias (__libc_connect, __connect)
+static_weak_alias (__libc_connect, connect)
+static_weak_alias (__libc_connect, __connect)
 libc_hidden_weak (__connect)

diff --git a/sysdeps/unix/sysv/linux/dirfd.c b/sysdeps/unix/sysv/linux/dirfd.c
index 1c637c666bdbe89f91eb65699cbfb8bbfffd27c5..0f6b8b6a5f6719c74b70552769710e47b1fa2562 100644 (file)
--- a/sysdeps/unix/sysv/linux/dirfd.c
+++ b/sysdeps/unix/sysv/linux/dirfd.c
@@ -27,5 +27,5 @@ __dirfd (DIR *dirp)
   return dirp->fd;
 }
 
-weak_alias (__dirfd, dirfd)
+static_weak_alias (__dirfd, dirfd)
 libc_hidden_def (dirfd)

diff --git a/sysdeps/unix/sysv/linux/fcntl64.c b/sysdeps/unix/sysv/linux/fcntl64.c
index 1861b18eee5dab350ffd55395b309473a0a36fbc..9682e4a07051468a5a10d005909b41c8aa224251 100644 (file)
--- a/sysdeps/unix/sysv/linux/fcntl64.c
+++ b/sysdeps/unix/sysv/linux/fcntl64.c
@@ -51,7 +51,7 @@ __libc_fcntl64 (int fd, int cmd, ...)
   return __fcntl64_nocancel_adjusted (fd, cmd, arg);
 }
 libc_hidden_def (__libc_fcntl64)
-weak_alias (__libc_fcntl64, __fcntl64)
+strong_alias (__libc_fcntl64, __fcntl64)
 libc_hidden_weak (__fcntl64)
 weak_alias (__libc_fcntl64, fcntl64)
 #if __TIMESIZE != 64

diff --git a/sysdeps/unix/sysv/linux/getlogin_r.c b/sysdeps/unix/sysv/linux/getlogin_r.c
index f03ecd4da93bacf4193fda693a33a3304b6dd0b8..d9ec2745228e9e9250e0cbf8e534455e34550db2 100644 (file)
--- a/sysdeps/unix/sysv/linux/getlogin_r.c
+++ b/sysdeps/unix/sysv/linux/getlogin_r.c
@@ -114,5 +114,5 @@ __getlogin_r (char *name, size_t namesize)
   return getlogin_r_fd0 (name, namesize);
 }
 libc_hidden_def (__getlogin_r)
-weak_alias (__getlogin_r, getlogin_r)
+static_weak_alias (__getlogin_r, getlogin_r)
 libc_hidden_weak (getlogin_r)

diff --git a/sysdeps/unix/sysv/linux/getrlimit64.c b/sysdeps/unix/sysv/linux/getrlimit64.c
index 8500fe366abb4de2652a34673b4e0d6bdf075f62..092eaea3e7b6c1331382b8317c7b90b6180d95b5 100644 (file)
--- a/sysdeps/unix/sysv/linux/getrlimit64.c
+++ b/sysdeps/unix/sysv/linux/getrlimit64.c
@@ -48,8 +48,8 @@ strong_alias (__getrlimit64, __GI___getrlimit)
 strong_alias (__getrlimit64, __getrlimit)
 /* Alpha defines a versioned getrlimit{64}.  */
 # ifndef USE_VERSIONED_RLIMIT
-weak_alias (__getrlimit64, getrlimit)
-weak_alias (__getrlimit64, getrlimit64)
+static_weak_alias (__getrlimit64, getrlimit)
+static_weak_alias (__getrlimit64, getrlimit64)
 libc_hidden_weak (getrlimit64)
 # else
 weak_alias (__getrlimit64, __GI_getrlimit64)

diff --git a/sysdeps/unix/sysv/linux/if_index.c b/sysdeps/unix/sysv/linux/if_index.c
index 5d137598f0eb46a80834ee1ad687fc209a831b95..601c5a2c11283a1fe4a9cf5eb5eeff7321786192 100644 (file)
--- a/sysdeps/unix/sysv/linux/if_index.c
+++ b/sysdeps/unix/sysv/linux/if_index.c
@@ -51,7 +51,7 @@ __if_nametoindex (const char *ifname)
   return status < 0 ? 0 : ifr.ifr_ifindex;
 }
 libc_hidden_def (__if_nametoindex)
-weak_alias (__if_nametoindex, if_nametoindex)
+static_weak_alias (__if_nametoindex, if_nametoindex)
 libc_hidden_weak (if_nametoindex)
 
 
@@ -67,7 +67,7 @@ __if_freenameindex (struct if_nameindex *ifn)
   free (ifn);
 }
 libc_hidden_def (__if_freenameindex)
-weak_alias (__if_freenameindex, if_freenameindex)
+static_weak_alias (__if_freenameindex, if_freenameindex)
 libc_hidden_weak (if_freenameindex)
 
 
@@ -184,7 +184,7 @@ __if_nameindex (void)
 
   return idx;
 }
-weak_alias (__if_nameindex, if_nameindex)
+static_weak_alias (__if_nameindex, if_nameindex)
 libc_hidden_weak (if_nameindex)
 
 
@@ -218,5 +218,5 @@ __if_indextoname (unsigned int ifindex, char ifname[IF_NAMESIZE])
   else
     return strncpy (ifname, ifr.ifr_name, IFNAMSIZ);
 }
-weak_alias (__if_indextoname, if_indextoname)
+static_weak_alias (__if_indextoname, if_indextoname)
 libc_hidden_weak (if_indextoname)

diff --git a/sysdeps/unix/sysv/linux/ifaddrs.c b/sysdeps/unix/sysv/linux/ifaddrs.c
index ddc4be78eec3ebe6799fdfe7b234316e299c7faa..ca7f2a3918995d8edb2321c931d0b64134158901 100644 (file)
--- a/sysdeps/unix/sysv/linux/ifaddrs.c
+++ b/sysdeps/unix/sysv/linux/ifaddrs.c
@@ -833,7 +833,7 @@ __getifaddrs (struct ifaddrs **ifap)
 
   return res;
 }
-weak_alias (__getifaddrs, getifaddrs)
+static_weak_alias (__getifaddrs, getifaddrs)
 libc_hidden_def (__getifaddrs)
 libc_hidden_weak (getifaddrs)
 
@@ -843,6 +843,6 @@ __freeifaddrs (struct ifaddrs *ifa)
 {
   free (ifa);
 }
-weak_alias (__freeifaddrs, freeifaddrs)
+static_weak_alias (__freeifaddrs, freeifaddrs)
 libc_hidden_def (__freeifaddrs)
 libc_hidden_weak (freeifaddrs)

diff --git a/sysdeps/unix/sysv/linux/lseek64.c b/sysdeps/unix/sysv/linux/lseek64.c
index 49f41368449356d695ed6e909f80aee16db9066b..f921bba9b084e395588b5320cf501875ee12b788 100644 (file)
--- a/sysdeps/unix/sysv/linux/lseek64.c
+++ b/sysdeps/unix/sysv/linux/lseek64.c
@@ -43,7 +43,7 @@ __lseek64 (int fd, off64_t offset, int whence)
 
 #ifdef  __OFF_T_MATCHES_OFF64_T
 weak_alias (__lseek64, lseek)
-weak_alias (__lseek64, __lseek)
+strong_alias (__lseek64, __lseek)
 strong_alias (__lseek64, __libc_lseek)
 libc_hidden_def (__lseek)
 #endif

diff --git a/sysdeps/unix/sysv/linux/mmap64.c b/sysdeps/unix/sysv/linux/mmap64.c
index e202356efede93bf92b22e0ae87959b2d1b61874..6bf4b0ab7fb06618d9ec408f5c1c7849dae83b02 100644 (file)
--- a/sysdeps/unix/sysv/linux/mmap64.c
+++ b/sysdeps/unix/sysv/linux/mmap64.c
@@ -62,7 +62,7 @@ weak_alias (__mmap64, mmap64)
 libc_hidden_def (__mmap64)
 
 #ifdef __OFF_T_MATCHES_OFF64_T
-weak_alias (__mmap64, mmap)
-weak_alias (__mmap64, __mmap)
+static_weak_alias (__mmap64, mmap)
+strong_alias (__mmap64, __mmap)
 libc_hidden_def (__mmap)
 #endif

diff --git a/sysdeps/unix/sysv/linux/pread64.c b/sysdeps/unix/sysv/linux/pread64.c
index 5fbf14b4be81dc6ff7a334ec1d34829456b024ec..8db26c21abbc2a994bca633c5ba0542ad2a9b9d8 100644 (file)
--- a/sysdeps/unix/sysv/linux/pread64.c
+++ b/sysdeps/unix/sysv/linux/pread64.c
@@ -25,7 +25,7 @@ __libc_pread64 (int fd, void *buf, size_t count, off64_t offset)
   return SYSCALL_CANCEL (pread64, fd, buf, count, SYSCALL_LL64_PRW (offset));
 }
 
-weak_alias (__libc_pread64, __pread64)
+strong_alias (__libc_pread64, __pread64)
 libc_hidden_weak (__pread64)
 weak_alias (__libc_pread64, pread64)
 

diff --git a/sysdeps/unix/sysv/linux/pwrite64.c b/sysdeps/unix/sysv/linux/pwrite64.c
index c1388b03bd83bd122ebe1eea553ab11ac78c06ea..aeccaa596250d149f3b6477b3cd14602d1e11ca9 100644 (file)
--- a/sysdeps/unix/sysv/linux/pwrite64.c
+++ b/sysdeps/unix/sysv/linux/pwrite64.c
@@ -25,7 +25,7 @@ __libc_pwrite64 (int fd, const void *buf, size_t count, off64_t offset)
   return SYSCALL_CANCEL (pwrite64, fd, buf, count, SYSCALL_LL64_PRW (offset));
 }
 
-weak_alias (__libc_pwrite64, __pwrite64)
+strong_alias (__libc_pwrite64, __pwrite64)
 libc_hidden_weak (__pwrite64)
 weak_alias (__libc_pwrite64, pwrite64)
 

diff --git a/sysdeps/unix/sysv/linux/read.c b/sysdeps/unix/sysv/linux/read.c
index cb2f22e31981c02232c4c9449730953a43dd787e..3ec3acdf1318f9b9d5dbd7d088df64af6658d0c3 100644 (file)
--- a/sysdeps/unix/sysv/linux/read.c
+++ b/sysdeps/unix/sysv/linux/read.c
@@ -28,6 +28,6 @@ __libc_read (int fd, void *buf, size_t nbytes)
 libc_hidden_def (__libc_read)
 
 libc_hidden_def (__read)
-weak_alias (__libc_read, __read)
+strong_alias (__libc_read, __read)
 libc_hidden_def (read)
-weak_alias (__libc_read, read)
+static_weak_alias (__libc_read, read)

diff --git a/sysdeps/unix/sysv/linux/recv.c b/sysdeps/unix/sysv/linux/recv.c
index 24ee8f74e4bccdfd5b703b4dbf71965a1ba9b74e..64a7245bebcce8f4fc847a3858b739943f458ef6 100644 (file)
--- a/sysdeps/unix/sysv/linux/recv.c
+++ b/sysdeps/unix/sysv/linux/recv.c
@@ -30,6 +30,6 @@ __libc_recv (int fd, void *buf, size_t len, int flags)
   return SOCKETCALL_CANCEL (recv, fd, buf, len, flags);
 #endif
 }
-weak_alias (__libc_recv, recv)
-weak_alias (__libc_recv, __recv)
+static_weak_alias (__libc_recv, recv)
+static_weak_alias (__libc_recv, __recv)
 libc_hidden_weak (__recv)

diff --git a/sysdeps/unix/sysv/linux/send.c b/sysdeps/unix/sysv/linux/send.c
index 68cdd4069d52159594216bc0bba45740162a6689..84404be4d3c727e66d20d546ca09e86f20ed9445 100644 (file)
--- a/sysdeps/unix/sysv/linux/send.c
+++ b/sysdeps/unix/sysv/linux/send.c
@@ -30,6 +30,6 @@ __libc_send (int fd, const void *buf, size_t len, int flags)
   return SOCKETCALL_CANCEL (send, fd, buf, len, flags);
 #endif
 }
-weak_alias (__libc_send, send)
-weak_alias (__libc_send, __send)
+static_weak_alias (__libc_send, send)
+static_weak_alias (__libc_send, __send)
 libc_hidden_def (__send)

diff --git a/sysdeps/unix/sysv/linux/write.c b/sysdeps/unix/sysv/linux/write.c
index dd40926e76d38f57e5748ece6a497e937d6a6558..f6c4d314511976686474195ce6c6f9b508425a63 100644 (file)
--- a/sysdeps/unix/sysv/linux/write.c
+++ b/sysdeps/unix/sysv/linux/write.c
@@ -27,7 +27,7 @@ __libc_write (int fd, const void *buf, size_t nbytes)
 }
 libc_hidden_def (__libc_write)
 
-weak_alias (__libc_write, __write)
+strong_alias (__libc_write, __write)
 libc_hidden_weak (__write)
-weak_alias (__libc_write, write)
+static_weak_alias (__libc_write, write)
 libc_hidden_weak (write)

diff --git a/sysdeps/wordsize-64/Makefile b/sysdeps/wordsize-64/Makefile
index 6a84d0f86302d1ee382af759ad42baa0119ca44f..c1efde12d670371d1b85935d0a1c907cd18c9909 100644 (file)
--- a/sysdeps/wordsize-64/Makefile
+++ b/sysdeps/wordsize-64/Makefile
@@ -8,6 +8,6 @@ fmt-xscanf-uint-convs += uint ulong
 endif
 
 # strtol is aliased to stroll
-CFLAGS-strtol.c += -fno-builtin-strtoll $(config-cflags-wno-ignored-attributes)
+CFLAGS-strtol.c += -fno-builtin-strtoll
 # strtoul is aliased to strtoull
-CFLAGS-strtoul.c += -fno-builtin-strtoull $(config-cflags-wno-ignored-attributes)
+CFLAGS-strtoul.c += -fno-builtin-strtoull

diff --git a/sysdeps/wordsize-64/strtol.c b/sysdeps/wordsize-64/strtol.c
index a21fa8da10a0cae8bcaf49e72ea6a710c7142c46..cd99cb22fd8b91a77db16f78138af79466206fb1 100644 (file)
--- a/sysdeps/wordsize-64/strtol.c
+++ b/sysdeps/wordsize-64/strtol.c
@@ -12,11 +12,11 @@
 #undef __isoc23_strtoll
 strong_alias (__strtol_internal, __strtoll_internal)
 libc_hidden_ver (__strtol_internal, __strtoll_internal)
-weak_alias (strtol, strtoll)
-libc_hidden_ver (strtol, strtoll)
-weak_alias (strtol, strtoq)
-libc_hidden_ver (strtol, strtoq)
-weak_alias (strtol, strtoimax)
+weak_alias (__strtol, strtoll)
+libc_hidden_ver (__strtol, strtoll)
+weak_alias (__strtol, strtoq)
+libc_hidden_ver (__strtol, strtoq)
+weak_alias (__strtol, strtoimax)
 weak_alias (__isoc23_strtol, __isoc23_strtoll)
 libc_hidden_ver (__isoc23_strtol, __isoc23_strtoll)
 weak_alias (__isoc23_strtol, __isoc23_strtoimax)

diff --git a/sysdeps/wordsize-64/strtoul.c b/sysdeps/wordsize-64/strtoul.c
index 60c82b89d9a8a19b163396cf5d5ef4a01f44992a..00e83d2c38778fef136e8059230268e3eb70ffc3 100644 (file)
--- a/sysdeps/wordsize-64/strtoul.c
+++ b/sysdeps/wordsize-64/strtoul.c
@@ -12,9 +12,9 @@
 #undef __isoc23_strtoull
 strong_alias (__strtoul_internal, __strtoull_internal)
 libc_hidden_ver (__strtoul_internal, __strtoull_internal)
-weak_alias (strtoul, strtoull)
-weak_alias (strtoul, strtouq)
-weak_alias (strtoul, strtoumax)
+weak_alias (__strtoul, strtoull)
+weak_alias (__strtoul, strtouq)
+weak_alias (__strtoul, strtoumax)
 weak_alias (__isoc23_strtoul, __isoc23_strtoull)
 libc_hidden_ver (__isoc23_strtoul, __isoc23_strtoull)
 weak_alias (__isoc23_strtoul, __isoc23_strtoumax)

diff --git a/sysdeps/wordsize-64/wcstol.c b/sysdeps/wordsize-64/wcstol.c
index 557c763941ee5aa4f783bca3dc927ef83bc2cbcd..ba8796b9b9f6844aa783dfdb57133fa959ea0e0f 100644 (file)
--- a/sysdeps/wordsize-64/wcstol.c
+++ b/sysdeps/wordsize-64/wcstol.c
@@ -12,9 +12,9 @@
 #undef __isoc23_wcstoll
 strong_alias (__wcstol_internal, __wcstoll_internal)
 libc_hidden_ver (__wcstol_internal, __wcstoll_internal)
-weak_alias (wcstol, wcstoll)
-weak_alias (wcstol, wcstoq)
-weak_alias (wcstol, wcstoimax)
+weak_alias (__wcstol, wcstoll)
+weak_alias (__wcstol, wcstoq)
+weak_alias (__wcstol, wcstoimax)
 weak_alias (__isoc23_wcstol, __isoc23_wcstoll)
 libc_hidden_ver (__isoc23_wcstol, __isoc23_wcstoll)
 weak_alias (__isoc23_wcstol, __isoc23_wcstoimax)

diff --git a/sysdeps/wordsize-64/wcstoul.c b/sysdeps/wordsize-64/wcstoul.c
index 9b48ca6ab215532f0256d02a579b954da5cf4b4e..f7a03871b6d710f7113c9453f7f8e6f1ef6e3a3b 100644 (file)
--- a/sysdeps/wordsize-64/wcstoul.c
+++ b/sysdeps/wordsize-64/wcstoul.c
@@ -12,9 +12,9 @@
 #undef __isoc23_wcstoull
 strong_alias (__wcstoul_internal, __wcstoull_internal)
 libc_hidden_ver (__wcstoul_internal, __wcstoull_internal)
-weak_alias (wcstoul, wcstoull)
-weak_alias (wcstoul, wcstouq)
-weak_alias (wcstoul, wcstoumax)
+weak_alias (__wcstoul, wcstoull)
+weak_alias (__wcstoul, wcstouq)
+weak_alias (__wcstoul, wcstoumax)
 weak_alias (__isoc23_wcstoul, __isoc23_wcstoull)
 libc_hidden_ver (__isoc23_wcstoul, __isoc23_wcstoull)
 weak_alias (__isoc23_wcstoul, __isoc23_wcstoumax)

diff --git a/sysdeps/x86_64/fpu/fclrexcpt.c b/sysdeps/x86_64/fpu/fclrexcpt.c
index 86b4228f2f4af567c0eb3dc86f3ef8ac394383c6..d5f70458c0dfacf5a54288d7c8a8c3423dc580f2 100644 (file)
--- a/sysdeps/x86_64/fpu/fclrexcpt.c
+++ b/sysdeps/x86_64/fpu/fclrexcpt.c
@@ -50,5 +50,5 @@ __feclearexcept (int excepts)
   return 0;
 }
 libm_hidden_def (__feclearexcept)
-weak_alias (__feclearexcept, feclearexcept)
+static_weak_alias (__feclearexcept, feclearexcept)
 libm_hidden_def (feclearexcept)

diff --git a/sysdeps/x86_64/fpu/fegetenv.c b/sysdeps/x86_64/fpu/fegetenv.c
index eea9d6bee70ab09622f52dfb4791efcb9b02ffdb..fa21ec4f86200ee41d500d4d36f6138f25801686 100644 (file)
--- a/sysdeps/x86_64/fpu/fegetenv.c
+++ b/sysdeps/x86_64/fpu/fegetenv.c
@@ -31,5 +31,5 @@ __fegetenv (fenv_t *envp)
   return 0;
 }
 libm_hidden_def (__fegetenv)
-weak_alias (__fegetenv, fegetenv)
+static_weak_alias (__fegetenv, fegetenv)
 libm_hidden_weak (fegetenv)

diff --git a/sysdeps/x86_64/fpu/fegetround.c b/sysdeps/x86_64/fpu/fegetround.c
index 9537cd3142e62a5c65e64459999934362bade00e..a7fc1a8870fab806ec9e654374fc7c976fea4997 100644 (file)
--- a/sysdeps/x86_64/fpu/fegetround.c
+++ b/sysdeps/x86_64/fpu/fegetround.c
@@ -30,5 +30,5 @@ __fegetround (void)
   return cw & 0xc00;
 }
 libm_hidden_def (__fegetround)
-weak_alias (__fegetround, fegetround)
+static_weak_alias (__fegetround, fegetround)
 libm_hidden_weak (fegetround)

diff --git a/sysdeps/x86_64/fpu/feholdexcpt.c b/sysdeps/x86_64/fpu/feholdexcpt.c
index 9a22a2ea77e2a17b16bbde033bf2a14e9e217b54..30e3120596505173ffe061272a79af6bc29fcf4d 100644 (file)
--- a/sysdeps/x86_64/fpu/feholdexcpt.c
+++ b/sysdeps/x86_64/fpu/feholdexcpt.c
@@ -37,5 +37,5 @@ __feholdexcept (fenv_t *envp)
   return 0;
 }
 libm_hidden_def (__feholdexcept)
-weak_alias (__feholdexcept, feholdexcept)
+static_weak_alias (__feholdexcept, feholdexcept)
 libm_hidden_weak (feholdexcept)

diff --git a/sysdeps/x86_64/fpu/fesetenv.c b/sysdeps/x86_64/fpu/fesetenv.c
index e4e721afffd20ad5f14c8b793b662049f021bc87..a7b87efcde592944d2908343c1e9eaaa4cf831f6 100644 (file)
--- a/sysdeps/x86_64/fpu/fesetenv.c
+++ b/sysdeps/x86_64/fpu/fesetenv.c
@@ -110,5 +110,5 @@ __fesetenv (const fenv_t *envp)
   return 0;
 }
 libm_hidden_def (__fesetenv)
-weak_alias (__fesetenv, fesetenv)
+static_weak_alias (__fesetenv, fesetenv)
 libm_hidden_weak (fesetenv)

diff --git a/sysdeps/x86_64/fpu/fesetround.c b/sysdeps/x86_64/fpu/fesetround.c
index e1ffb3b7a9e3c71c545d0aa1c76254f0546f933f..8a5f6c425c6a000965f9212322400e07064a1de7 100644 (file)
--- a/sysdeps/x86_64/fpu/fesetround.c
+++ b/sysdeps/x86_64/fpu/fesetround.c
@@ -44,5 +44,5 @@ __fesetround (int round)
   return 0;
 }
 libm_hidden_def (__fesetround)
-weak_alias (__fesetround, fesetround)
+static_weak_alias (__fesetround, fesetround)
 libm_hidden_weak (fesetround)

diff --git a/sysdeps/x86_64/fpu/fraiseexcpt.c b/sysdeps/x86_64/fpu/fraiseexcpt.c
index da3a31f4c20c51a37834ac65dc2e573e73aa5bac..dae0c3bc3110cb55e0b3a804151c5ee77dc7550c 100644 (file)
--- a/sysdeps/x86_64/fpu/fraiseexcpt.c
+++ b/sysdeps/x86_64/fpu/fraiseexcpt.c
@@ -117,5 +117,5 @@ __feraiseexcept (int excepts)
   return 0;
 }
 libm_hidden_def (__feraiseexcept)
-weak_alias (__feraiseexcept, feraiseexcept)
+static_weak_alias (__feraiseexcept, feraiseexcept)
 libm_hidden_weak (feraiseexcept)

diff --git a/sysdeps/x86_64/fpu/ftestexcept.c b/sysdeps/x86_64/fpu/ftestexcept.c
index 39df30fbd231e67ab2e8d7c58ae4d079eb4555be..7e0a097696c3dcb02085eea175f106559c5f0b7f 100644 (file)
--- a/sysdeps/x86_64/fpu/ftestexcept.c
+++ b/sysdeps/x86_64/fpu/ftestexcept.c
@@ -31,5 +31,5 @@ __fetestexcept (int excepts)
   return (temp | mxscr) & excepts & FE_ALL_EXCEPT;
 }
 libm_hidden_def (__fetestexcept)
-weak_alias (__fetestexcept, fetestexcept)
+static_weak_alias (__fetestexcept, fetestexcept)
 libm_hidden_def (fetestexcept)

diff --git a/sysdeps/x86_64/fpu/multiarch/s_exp10m1f.c b/sysdeps/x86_64/fpu/multiarch/s_exp10m1f.c
index 7bb1749a283b6ba6c752a2c54c09eacb334b709e..4b0c825fc5f9548fab9dc31b3f0cdec39fe8b278 100644 (file)
--- a/sysdeps/x86_64/fpu/multiarch/s_exp10m1f.c
+++ b/sysdeps/x86_64/fpu/multiarch/s_exp10m1f.c
@@ -18,6 +18,7 @@
 
 #include <sysdeps/x86/isa-level.h>
 #if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
+# include <math.h>
 # include <libm-alias-float.h>
 
 extern float __redirect_exp10m1f (float);

diff --git a/sysdeps/x86_64/fpu/multiarch/s_exp2m1f.c b/sysdeps/x86_64/fpu/multiarch/s_exp2m1f.c
index 1361b79e51931a52271a45460d0385fa6034820f..890b149ec2f3922e7405813cf7a9e6b097eb226b 100644 (file)
--- a/sysdeps/x86_64/fpu/multiarch/s_exp2m1f.c
+++ b/sysdeps/x86_64/fpu/multiarch/s_exp2m1f.c
@@ -18,6 +18,7 @@
 
 #include <sysdeps/x86/isa-level.h>
 #if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
+# include <math.h>
 # include <libm-alias-float.h>
 
 extern float __redirect_exp2m1f (float);

diff --git a/sysdeps/x86_64/fpu/multiarch/s_sincos.c b/sysdeps/x86_64/fpu/multiarch/s_sincos.c
index 5d60cd054873414699fad40087a82836ae3a54e9..4514eedcd1e91d8e6c74dc8e9d05a583be3c73a7 100644 (file)
--- a/sysdeps/x86_64/fpu/multiarch/s_sincos.c
+++ b/sysdeps/x86_64/fpu/multiarch/s_sincos.c
@@ -18,6 +18,7 @@
 
 #include <sysdeps/x86/isa-level.h>
 #if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
+# include <math.h>
 # include <libm-alias-double.h>
 
 extern void __redirect_sincos (double, double *, double *);

diff --git a/sysdeps/x86_64/multiarch/mempcpy.c b/sysdeps/x86_64/multiarch/mempcpy.c
index ba5297e7c3b948372e5e000e71a665d41f351c4c..cc67b425be839b78ef63c1da6039c7aecb0711d5 100644 (file)
--- a/sysdeps/x86_64/multiarch/mempcpy.c
+++ b/sysdeps/x86_64/multiarch/mempcpy.c
@@ -36,7 +36,7 @@ weak_alias (__mempcpy, mempcpy)
 # ifdef SHARED
 __hidden_ver1 (__mempcpy, __GI___mempcpy, __redirect___mempcpy)
   __attribute__ ((visibility ("hidden"))) __attribute_copy__ (mempcpy);
-__hidden_ver1 (mempcpy, __GI_mempcpy, __redirect_mempcpy)
+__hidden_ver1 (__mempcpy, __GI_mempcpy, __redirect_mempcpy)
   __attribute__ ((visibility ("hidden"))) __attribute_copy__ (mempcpy);
 # endif
 #endif

diff --git a/sysdeps/x86_64/multiarch/stpcpy.c b/sysdeps/x86_64/multiarch/stpcpy.c
index df027e314e4a25f6a051b42109b2e414e1a484a1..5b084e78f769d851064f48c945d233d66b7ba009 100644 (file)
--- a/sysdeps/x86_64/multiarch/stpcpy.c
+++ b/sysdeps/x86_64/multiarch/stpcpy.c
@@ -36,7 +36,7 @@ weak_alias (__stpcpy, stpcpy)
 # ifdef SHARED
 __hidden_ver1 (__stpcpy, __GI___stpcpy, __redirect___stpcpy)
   __attribute__ ((visibility ("hidden"))) __attribute_copy__ (stpcpy);
-__hidden_ver1 (stpcpy, __GI_stpcpy, __redirect_stpcpy)
+__hidden_ver1 (__stpcpy, __GI_stpcpy, __redirect_stpcpy)
   __attribute__ ((visibility ("hidden"))) __attribute_copy__ (stpcpy);
 # endif
 #endif

diff --git a/sysdeps/x86_64/multiarch/strnlen.c b/sysdeps/x86_64/multiarch/strnlen.c
index 6444ca1d8028bd0bd46878e0c1971ff488bb208f..0b0bd977de06185644fe19893dd79df4f698e123 100644 (file)
--- a/sysdeps/x86_64/multiarch/strnlen.c
+++ b/sysdeps/x86_64/multiarch/strnlen.c
@@ -33,7 +33,7 @@ weak_alias (__strnlen, strnlen);
 # ifdef SHARED
 __hidden_ver1 (__strnlen, __GI___strnlen, __redirect___strnlen)
   __attribute__((visibility ("hidden"))) __attribute_copy__ (strnlen);
-__hidden_ver1 (strnlen, __GI_strnlen, __redirect_strnlen)
+__hidden_ver1 (__strnlen, __GI_strnlen, __redirect_strnlen)
   __attribute__((weak, visibility ("hidden"))) __attribute_copy__ (strnlen);
 # endif
 #endif

diff --git a/sysdeps/x86_64/multiarch/wcschr.c b/sysdeps/x86_64/multiarch/wcschr.c
index 3df2367f93c2b645798b1a9619bace3ae7e65745..5a10cccde1c41d95ad2eb41634a33cba00b07c4c 100644 (file)
--- a/sysdeps/x86_64/multiarch/wcschr.c
+++ b/sysdeps/x86_64/multiarch/wcschr.c
@@ -33,7 +33,7 @@ weak_alias (__wcschr, wcschr);
 # ifdef SHARED
 __hidden_ver1 (__wcschr, __GI___wcschr, __redirect___wcschr)
   __attribute__((visibility ("hidden")));
-__hidden_ver1 (wcschr, __GI_wcschr, __redirect_wcschr)
+__hidden_ver1 (__wcschr, __GI_wcschr, __redirect_wcschr)
   __attribute__((weak, visibility ("hidden")));
 # endif
 #endif

diff --git a/sysdeps/x86_64/multiarch/wmemchr.c b/sysdeps/x86_64/multiarch/wmemchr.c
index bba610394cbf29b4ff10a6195415985de88e23f2..b5bee75f385e155fc3079b96ce1633b22a666296 100644 (file)
--- a/sysdeps/x86_64/multiarch/wmemchr.c
+++ b/sysdeps/x86_64/multiarch/wmemchr.c
@@ -33,7 +33,7 @@ weak_alias (__wmemchr, wmemchr)
 # ifdef SHARED
 __hidden_ver1 (__wmemchr, __GI___wmemchr, __redirect___wmemchr)
   __attribute__((visibility ("hidden")));
-__hidden_ver1 (wmemchr, __GI_wmemchr, __redirect_wmemchr)
+__hidden_ver1 (__wmemchr, __GI_wmemchr, __redirect_wmemchr)
   __attribute__((weak, visibility ("hidden")));
 # endif
 #endif

diff --git a/sysdeps/x86_64/multiarch/wmemset.c b/sysdeps/x86_64/multiarch/wmemset.c
index 0169f2ac5423325d797b68ae916805e411ff0298..096633b7acb39df4ef30e91bb71a9b860efd6c15 100644 (file)
--- a/sysdeps/x86_64/multiarch/wmemset.c
+++ b/sysdeps/x86_64/multiarch/wmemset.c
@@ -34,7 +34,7 @@ weak_alias (__wmemset, wmemset)
 # ifdef SHARED
 __hidden_ver1 (__wmemset, __GI___wmemset, __redirect___wmemset)
   __attribute__ ((visibility ("hidden")));
-__hidden_ver1 (wmemset, __GI_wmemset, __redirect_wmemset)
+__hidden_ver1 (__wmemset, __GI_wmemset, __redirect_wmemset)
   __attribute__ ((visibility ("hidden")));
 # endif
 #endif

diff --git a/termios/Makefile b/termios/Makefile
index 1e2360825554f5da1654cac09b6f0f85a541a8d2..0308bacf74c1625788ce2b8b6b338ca2e8d8cd2e 100644 (file)
--- a/termios/Makefile
+++ b/termios/Makefile
@@ -53,4 +53,3 @@ routines := \
 include ../Rules
 
 CFLAGS-tcdrain.c += -fexceptions -fasynchronous-unwind-tables
-CFLAGS-tcsetattr.c += $(config-cflags-wno-ignored-attributes)

diff --git a/time/Makefile b/time/Makefile
index 3e010d2c150a4b23b538600e86b12ac586df4c46..55b8b690ca0226010e218b4c218795cb0086ee4a 100644 (file)
--- a/time/Makefile
+++ b/time/Makefile
@@ -141,7 +141,6 @@ CFLAGS-tzset.c += $(tz-cflags)
 CFLAGS-getdate.c += -fexceptions
 CFLAGS-clock_nanosleep.c += -fexceptions -fasynchronous-unwind-tables
 CFLAGS-nanosleep.c += -fexceptions -fasynchronous-unwind-tables
-CFLAGS-mktime.c += $(config-cflags-wno-ignored-attributes)
 
 # Don't warn about Y2k problem in strftime format string.
 CFLAGS-test_time.c += -Wno-format

diff --git a/time/mktime.c b/time/mktime.c
index 86d496ca65c24ee10eb0dc6fc364c1f1219b77ce..6769bab47842167f4bdb35f1981b6faa7caa9add 100644 (file)
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -573,6 +573,6 @@ mktime (struct tm *tp)
 
 #endif
 
-weak_alias (mktime, timelocal)
+static_weak_alias (mktime, timelocal)
 libc_hidden_def (mktime)
 libc_hidden_weak (timelocal)

diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile
index 559438c1ce8546895e6cee95369613f829fd5d21..383cf43a0766f29b088f47e8999535b5e11f95be 100644 (file)
--- a/wcsmbs/Makefile
+++ b/wcsmbs/Makefile
@@ -248,32 +248,24 @@ CFLAGS-wcwidth.c += -I../wctype
 CFLAGS-wcswidth.c += -I../wctype
 
 strtox-CFLAGS = -I../include
-CFLAGS-wcstol.c += $(strtox-CFLAGS) $(config-cflags-wno-ignored-attributes)
-CFLAGS-wcstoul.c += $(strtox-CFLAGS) $(config-cflags-wno-ignored-attributes)
+CFLAGS-wcstol.c += $(strtox-CFLAGS)
+CFLAGS-wcstoul.c += $(strtox-CFLAGS)
 CFLAGS-wcstoll.c += $(strtox-CFLAGS)
 CFLAGS-wcstoull.c += $(strtox-CFLAGS)
-CFLAGS-wcstod.c += $(strtox-CFLAGS) $(config-cflags-wno-ignored-attributes)
-CFLAGS-wcstold.c += $(strtox-CFLAGS) $(config-cflags-wno-ignored-attributes)
+CFLAGS-wcstod.c += $(strtox-CFLAGS)
+CFLAGS-wcstold.c += $(strtox-CFLAGS)
 CFLAGS-wcstof128.c += $(strtox-CFLAGS)
-CFLAGS-wcstof.c += $(strtox-CFLAGS) $(config-cflags-wno-ignored-attributes)
+CFLAGS-wcstof.c += $(strtox-CFLAGS)
 CFLAGS-wcstol_l.c += $(strtox-CFLAGS)
 CFLAGS-wcstoul_l.c += $(strtox-CFLAGS)
 CFLAGS-wcstoll_l.c += $(strtox-CFLAGS)
 CFLAGS-wcstoull_l.c += $(strtox-CFLAGS)
-CFLAGS-wcstod_l.c += $(strtox-CFLAGS) $(config-cflags-wno-ignored-attributes)
-CFLAGS-wcstold_l.c += $(strtox-CFLAGS) $(config-cflags-wno-ignored-attributes)
+CFLAGS-wcstod_l.c += $(strtox-CFLAGS)
+CFLAGS-wcstold_l.c += $(strtox-CFLAGS)
 CFLAGS-wcstof128_l.c += $(strtox-CFLAGS)
-CFLAGS-wcstof_l.c += $(strtox-CFLAGS) $(config-cflags-wno-ignored-attributes)
+CFLAGS-wcstof_l.c += $(strtox-CFLAGS)
 CPPFLAGS-tst-wchar-h.c += $(no-fortify-source) -D_FORTIFY_SOURCE=2
 
-CFLAGS-wcschr.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-wmemchr.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-wmemset.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-mbrtowc.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-wcrtomb.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-wcstoll.c += $(config-cflags-wno-ignored-attributes)
-CFLAGS-wcstoull.c += $(config-cflags-wno-ignored-attributes)
-
 CFLAGS-isoc99_wscanf.c += -fexceptions
 CFLAGS-isoc99_fwscanf.c += -fexceptions
 CFLAGS-isoc99_vwscanf.c += -fexceptions

diff --git a/wcsmbs/mbrtowc.c b/wcsmbs/mbrtowc.c
index 47068ed0e0104b68d799c09f0eaabfda047a9a8d..ce8f6045b13226cd312a3abff6bcd7a0bf04c52b 100644 (file)
--- a/wcsmbs/mbrtowc.c
+++ b/wcsmbs/mbrtowc.c
@@ -117,5 +117,5 @@ __mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
   return result;
 }
 libc_hidden_def (__mbrtowc)
-weak_alias (__mbrtowc, mbrtowc)
+static_weak_alias (__mbrtowc, mbrtowc)
 libc_hidden_weak (mbrtowc)

diff --git a/wcsmbs/wcrtomb.c b/wcsmbs/wcrtomb.c
index d4ce187781021fd0ee424a0a7349e72c7e79375d..19788ffbb5114f72c2b3ea71d5b8fd97798529fd 100644 (file)
--- a/wcsmbs/wcrtomb.c
+++ b/wcsmbs/wcrtomb.c
@@ -123,5 +123,5 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
 {
   return __wcrtomb_internal (s, wc, ps, (size_t) -1);
 }
-weak_alias (__wcrtomb, wcrtomb)
+static_weak_alias (__wcrtomb, wcrtomb)
 libc_hidden_weak (wcrtomb)

diff --git a/wcsmbs/wcschr.c b/wcsmbs/wcschr.c
index 6bd3ad9ddf6698461c0bd0669ab8a48c2ab8a049..f64f6baac4eb42d261fb7dd057b5f9bf068feb1b 100644 (file)
--- a/wcsmbs/wcschr.c
+++ b/wcsmbs/wcschr.c
@@ -45,5 +45,5 @@ WCSCHR (const wchar_t *wcs, const wchar_t wc)
   return dest;
 }
 libc_hidden_def (__wcschr)
-weak_alias (__wcschr, wcschr)
+static_weak_alias (__wcschr, wcschr)
 libc_hidden_weak (wcschr)

diff --git a/wcsmbs/wmemchr.c b/wcsmbs/wmemchr.c
index a5403581a3b0d501e7732fa99fb11b80f616d219..e78874d3022068ab00b8f0504d2dc936513b7aaa 100644 (file)
--- a/wcsmbs/wmemchr.c
+++ b/wcsmbs/wmemchr.c
@@ -60,5 +60,5 @@ __wmemchr (const wchar_t *s, wchar_t c, size_t n)
   return NULL;
 }
 libc_hidden_def (__wmemchr)
-weak_alias (__wmemchr, wmemchr)
+static_weak_alias (__wmemchr, wmemchr)
 libc_hidden_weak (wmemchr)

diff --git a/wcsmbs/wmemset.c b/wcsmbs/wmemset.c
index 3441ece2b2a81eb9ac8f1a0b120cda3d853889bf..517a22b06b01a924f462351dd81eceb3a0912dbe 100644 (file)
--- a/wcsmbs/wmemset.c
+++ b/wcsmbs/wmemset.c
@@ -52,5 +52,5 @@ __wmemset (wchar_t *s, wchar_t c, size_t n)
   return s;
 }
 libc_hidden_def (__wmemset)
-weak_alias (__wmemset, wmemset)
+static_weak_alias (__wmemset, wmemset)
 libc_hidden_weak (wmemset)

diff --git a/wctype/Makefile b/wctype/Makefile
index 4708594d8498490ef78157dbd64c1d4ad7736a7a..cdcf3b2328d2ae0166eddd0350d2f1cdce677478 100644 (file)
--- a/wctype/Makefile
+++ b/wctype/Makefile
@@ -29,5 +29,3 @@ routines      := wcfuncs wctype iswctype wctrans towctrans \
 tests  := test_wctype test_wcfuncs bug-wctypeh
 
 include ../Rules
-
-CFLAGS-wcfuncs.c += $(config-cflags-wno-ignored-attributes)

diff --git a/wctype/wcfuncs.c b/wctype/wcfuncs.c
index 49f9ed21572400addcc442ffcee2da1c97a46bb6..0d078609a5183922ee5abd466472e0444cf0e570 100644 (file)
--- a/wctype/wcfuncs.c
+++ b/wctype/wcfuncs.c
@@ -34,7 +34,7 @@
     const char *desc = _NL_CURRENT (LC_CTYPE, i);                            \
     return wctype_table_lookup (desc, wc);                                   \
   }                                                                          \
-  weak_alias (__isw##name, isw##name)
+  static_weak_alias (__isw##name, isw##name)
 
 #undef iswalnum
 func (alnum, __ISwalnum)
@@ -78,7 +78,7 @@ __towlower (wint_t wc)
   return wctrans_table_lookup (desc, wc);
 }
 libc_hidden_def (__towlower)
-weak_alias (__towlower, towlower)
+static_weak_alias (__towlower, towlower)
 libc_hidden_weak (towlower)
 
 #undef towupper
@@ -90,5 +90,5 @@ __towupper (wint_t wc)
   return wctrans_table_lookup (desc, wc);
 }
 libc_hidden_def (__towupper)
-weak_alias (__towupper, towupper)
+static_weak_alias (__towupper, towupper)
 libc_hidden_weak (towupper)