aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog2
-rw-r--r--nptl/Makefile4
2 files changed, 4 insertions, 2 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index a2c530a..6ccd981 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,7 @@
2012-01-07 Ulrich Drepper <drepper@gmail.com>
+ * Makefile: Remove elf=yes test, only ELF is supported.
+
* shlib-versions: Remove entries for ports architectures.
In case anyone cares, the IA-64 architecture could move to ports.
diff --git a/nptl/Makefile b/nptl/Makefile
index 18c3182..be6f490 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2008,2009,2010 Free Software Foundation, Inc.
+# Copyright (C) 2002-2008,2009,2010,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
@@ -519,7 +519,7 @@ $(objpfx)libpthread.so: +postinit += $(addprefix $(objpfx),$(crtn-objs))
# Depend on ld.so too to get proper versions of ld.so symbols.
$(objpfx)libpthread.so: $(common-objpfx)libc.so \
$(common-objpfx)libc_nonshared.a \
- $(if $(filter yes,$(elf)), $(elfobjdir)/ld.so)
+ $(elfobjdir)/ld.so
# Make sure we link with the thread library.
ifeq ($(build-shared),yes)