Conditionalize elf/dl-sysdep.c contents on [SHARED].

diff --git a/ChangeLog b/ChangeLog
index 7108c3c171af98e65b4684a98e32d7ee67edc0b6..ab2620768e4cab429227e6b3a2b6ad1399cdba5b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-09-28  Roland McGrath  <roland@hack.frob.com>
 
+       * elf/dl-sysdep.c: Conditionalize whole contents on [SHARED].
+
        * Makeconfig (nssobjdir, resolvobjdir): Remove variables.
        (elfobjdir): Move out of conditionals.
 

diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c
index 7d2283910e974e0bedd70fb43c73cc6cc9fe682d..fb0849a54399a03e9aaee60c79f205af03ba72c2 100644 (file)
--- a/elf/dl-sysdep.c
+++ b/elf/dl-sysdep.c
@@ -1,6 +1,5 @@
 /* Operating system support for run-time dynamic linker.  Generic Unix version.
-   Copyright (C) 1995-1998,2000-2010,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
@@ -17,6 +16,12 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+/* We conditionalize the whole of this file rather than simply eliding it
+   from the static build, because other sysdeps/ versions of this file
+   might define things needed by a static build.  */
+
+#ifdef SHARED
+
 #include <assert.h>
 #include <elf.h>
 #include <errno.h>
@@ -592,3 +597,5 @@ _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz,
 
   return result;
 }
+
+#endif