From a816b435dd0b8dde7dc2f8d995bd290998801317 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Mon, 5 Aug 2002 01:21:25 +0000
Subject: * Makerules (cpp-srcs-left): When setting this to run

	cppflags-iterator.mk, must append .c to $(tests) and $(xtests)
	words.  Combine the two loops into one on the concatenated list,
	including those as well as $(test-srcs).

	* elf/dl-minimal.c (__libc_memalign): Guts of malloc moved here,
	since we align here with optimally minimal waste anyway.
	(malloc): Just call that.

	* sysdeps/generic/libc-tls.c (__libc_setup_tls): Set l_tls_offset to
	the right variable.

	* elf/dl-load.c (_dl_map_object_from_fd): Use p_vaddr, not p_offset,
	to compute memory location for l_tls_initimage.
	* elf/rtld.c (_dl_start): Likewise.
	* sysdeps/generic/libc-tls.c (__libc_setup_tls): Likewise.

	* libio/oldiopopen.c: Move #include's before #if SHLIB_COMPAT,
	because the .d file is generated in the non-shared case and
	so fails to catch them otherwise.

	* sysdeps/generic/dl-tls.c (_dl_allocate_tls_storage): New function,
	split out of _dl_allocate_tls.
	(_dl_allocate_tls_init): Likewise.
	(_dl_allocate_tls): Call those.
	* sysdeps/generic/ldsodefs.h: Declare them with attribute_hidden.
	* elf/rtld.c (dl_main): Call them separately instead of calling
	_dl_allocate_tls.  Delay _dl_allocate_tls_init until after relocation
	is finished, so that the initializer data has been relocated before we
	copy it into the main thread's TLS block.

	* sysdeps/generic/dl-tls.c (_dl_allocate_tls): Fix off-by-one error in
	loop conditions, prevented the last used module from being initialized.
---
 Makerules | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'Makerules')

diff --git a/Makerules b/Makerules
index 400d7d9ef5..6d05287b0d 100644
--- a/Makerules
+++ b/Makerules
@@ -1040,15 +1040,11 @@ check: tests
 .PHONY: xcheck
 xcheck: xtests
 
-ifneq (,$(tests))
-cpp-srcs-left = $(tests)
+all-tests = $(strip $(tests) $(xtests) $(test-srcs))
+ifneq (,$(all-tests))
+cpp-srcs-left = $(all-tests:=.c)
 lib := tests
-include $(patsubst %,$(..)cppflags-iterator.mk,$(tests))
-endif
-ifneq (,$(xtests))
-cpp-srcs-left = $(xtests)
-lib := tests
-include $(patsubst %,$(..)cppflags-iterator.mk,$(xtests))
+include $(patsubst %,$(..)cppflags-iterator.mk,$(all-tests))
 endif
 
 .PHONY: TAGS
-- 
cgit v1.2.3