about summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2012-01-07 20:30:26 -0500
committerUlrich Drepper <drepper@gmail.com>2012-01-07 20:30:26 -0500
commit0269750ca60bbfdf92dbe1edfe961adfbc9a34e7 (patch)
treee148227ce15cd7abef82dff9d706d03d0b687292 /nptl
parent16dd419d920dbab67ddc6e605bc0dacdc38f463c (diff)
downloadglibc-0269750ca60bbfdf92dbe1edfe961adfbc9a34e7.tar.gz
glibc-0269750ca60bbfdf92dbe1edfe961adfbc9a34e7.tar.xz
glibc-0269750ca60bbfdf92dbe1edfe961adfbc9a34e7.zip
Remove non-ELF support
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 a2c530a83e..6ccd981498 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 18c3182976..be6f490738 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)