From d1e815ed25625c1412ffcd9ceaf7c860c69dbf40 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Wed, 25 Nov 2015 02:48:22 +0100 Subject: [PATCH] Revert not defining NO_HIDDEN on hurd * sysdeps/mach/hurd/configure.ac (NO_HIDDEN): Define. * sysdeps/mach/hurd/configure: Regenerate. --- ChangeLog | 2 -- sysdeps/mach/hurd/configure | 3 +++ sysdeps/mach/hurd/configure.ac | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a7e96b3be..77bf20fce8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,8 +21,6 @@ (__nanosleep): Rename to __libc_nanosleep. (__nanosleep): Add weak_alias. (nanosleep): Update alias. - * sysdeps/mach/hurd/configure.ac (NO_HIDDEN): Do not define. - * sysdeps/mach/hurd/configure: Regenerate. 2015-11-24 Joseph Myers diff --git a/sysdeps/mach/hurd/configure b/sysdeps/mach/hurd/configure index dc43144dfd..3d155a450e 100644 --- a/sysdeps/mach/hurd/configure +++ b/sysdeps/mach/hurd/configure @@ -1,5 +1,8 @@ # This file is generated from configure.ac by Autoconf. DO NOT EDIT! +$as_echo "#define NO_HIDDEN 1" >>confdefs.h + + if test -n "$sysheaders"; then OLD_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $SYSINCLUDES" diff --git a/sysdeps/mach/hurd/configure.ac b/sysdeps/mach/hurd/configure.ac index 4e7e2600d0..af9a9ea052 100644 --- a/sysdeps/mach/hurd/configure.ac +++ b/sysdeps/mach/hurd/configure.ac @@ -1,5 +1,8 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. +dnl We need this setting because of the need for PLT calls in ld.so. +AC_DEFINE([NO_HIDDEN]) + if test -n "$sysheaders"; then OLD_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $SYSINCLUDES" -- 2.11.4.GIT