This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[COMMITTED PATCH] Conditionalize elf/dl-sysdep.c contents on [SHARED].
- From: Roland McGrath <roland at hack dot frob dot com>
- To: libc-alpha at sourceware dot org
- Date: Fri, 28 Sep 2012 14:32:37 -0700 (PDT)
- Subject: [COMMITTED PATCH] Conditionalize elf/dl-sysdep.c contents on [SHARED].
This fixes static linking on a configuration using the generic dl-sysdep.c.
* elf/dl-sysdep.c: Conditionalize whole contents on [SHARED].
diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c
index 7d22839..fb0849a 100644
--- 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