Consistently include Makeconfig after defining subdir.

[thirdparty/glibc.git] / stdlib / Makefile

diff --git a/stdlib/Makefile b/stdlib/Makefile
index 57830a8cb92f0f57b95c1ca6d731a9487c1788a8..5f2c10cec26d6d49e7a853fc438ed46295c53e15 100644 (file)
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2012 Free Software Foundation, Inc.
+# Copyright (C) 1991-2014 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
@@ -20,12 +20,15 @@
 #
 subdir := stdlib
 
-headers        := stdlib.h bits/stdlib.h bits/stdlib-ldbl.h                          \
+include ../Makeconfig
+
+headers        := stdlib.h bits/stdlib.h bits/stdlib-ldbl.h bits/stdlib-float.h      \
           monetary.h bits/monetary-ldbl.h                                    \
           inttypes.h stdint.h bits/wordsize.h                                \
           errno.h sys/errno.h bits/errno.h                                   \
           ucontext.h sys/ucontext.h                                          \
-          alloca.h fmtmsg.h
+          alloca.h fmtmsg.h                                                  \
+          bits/stdlib-bsearch.h
 
 routines       :=                                                            \
        atof atoi atol atoll                                                  \
@@ -33,7 +36,7 @@ routines      :=                                                            \
        bsearch qsort msort                                                   \
        getenv putenv setenv secure-getenv                                    \
        exit on_exit atexit cxa_atexit cxa_finalize old_atexit                \
-       quick_exit at_quick_exit cxa_at_quick_exit                            \
+       quick_exit at_quick_exit cxa_at_quick_exit cxa_thread_atexit_impl     \
        abs labs llabs                                                        \
        div ldiv lldiv                                                        \
        mblen mbstowcs mbtowc wcstombs wctomb                                 \
@@ -70,10 +73,10 @@ tests               := tst-strtol tst-strtod testmb testrand testsort testdiv   \
                   tst-makecontext2 tst-strtod6 tst-unsetenv1               \
                   tst-makecontext3 bug-getcontext bug-fmtmsg1              \
                   tst-secure-getenv tst-strtod-overflow tst-strtod-round   \
-                  tst-tininess tst-strtod-underflow
+                  tst-tininess tst-strtod-underflow tst-tls-atexit
 tests-static   := tst-secure-getenv
 
-include ../Makeconfig
+modules-names  = tst-tls-atexit-lib
 
 ifeq ($(build-shared),yes)
 tests          += tst-putenv
@@ -129,19 +132,21 @@ endif
 
 $(objpfx)isomac.out: $(objpfx)isomac
        $(dir $<)$(notdir $<) '$(CC)'  \
-       '-I../include $(+sysdep-includes) $(sysincludes) -I..' > $<.out
+       '-I../include $(+sysdep-includes) $(sysincludes) -I..' > $<.out; \
+       $(evaluate-test)
 
 isomac-CFLAGS = -O
 $(objpfx)isomac: isomac.c
        $(native-compile)
 
 $(objpfx)tst-fmtmsg.out: tst-fmtmsg.sh $(objpfx)tst-fmtmsg
-       $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)stdlib/
+       $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' $(common-objpfx)stdlib/; \
+       $(evaluate-test)
 
 $(objpfx)tst-putenv: $(objpfx)tst-putenvmod.so
 LDFLAGS-tst-putenv = $(no-as-needed)
 
-$(objpfx)tst-putenvmod.so: $(objpfx)tst-putenvmod.os
+$(objpfx)tst-putenvmod.so: $(objpfx)tst-putenvmod.os $(link-libc-deps)
        $(build-module)
 CFLAGS-tst-putenvmod.c = -DNOT_IN_libc=1
 
@@ -154,3 +159,10 @@ $(objpfx)bug-getcontext: $(link-libm)
 $(objpfx)tst-strtod-round: $(link-libm)
 $(objpfx)tst-tininess: $(link-libm)
 $(objpfx)tst-strtod-underflow: $(link-libm)
+$(objpfx)tst-strtod6: $(link-libm)
+
+tst-tls-atexit-lib.so-no-z-defs = yes
+
+$(objpfx)tst-tls-atexit: $(common-objpfx)nptl/libpthread.so \
+                        $(common-objpfx)dlfcn/libdl.so
+$(objpfx)tst-tls-atexit.out: $(objpfx)tst-tls-atexit-lib.so