diff --git a/ChangeLog b/ChangeLog
index 04f67f0dd9..1371751346 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-05-10  Thomas Schwinge  <thomas@schwinge.name>
 
+	* include/libc-symbols.h [NO_HIDDEN] (hidden_nolink): New macro.
+
 	* nss/makedb.c (MAP_POPULATE): If not defined, define to zero.
 
 2012-05-10  Samuel Thibault  <samuel.thibault@ens-lyon.org>
diff --git a/include/libc-symbols.h b/include/libc-symbols.h
index 0c3274e253..12b3639647 100644
--- a/include/libc-symbols.h
+++ b/include/libc-symbols.h
@@ -1,7 +1,6 @@
 /* Support macros for making weak and strong aliases for symbols,
    and for using symbol sets and linker warnings with GNU ld.
-   Copyright (C) 1995-1998,2000-2006,2008,2009,2011,2012
-   Free Software Foundation, Inc.
+   Copyright (C) 1995-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -550,6 +549,7 @@ for linking")
 # define hidden_data_weak(name)
 # define hidden_data_def(name)
 # define hidden_data_ver(local, name)
+# define hidden_nolink(name, lib, version)
 #endif
 
 #if !defined NOT_IN_libc