Revert "BZ 16133 has been fixed (async signal safe TLS)."
[jlayton/glibc.git] / Makefile
index 61cfa436c4341c8406e32b5ecdbdb8e8f0698b48..51d4690377af160ea17e11d218456da71b4a64b9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
-# Copyright (C) 1991-2002,2003,2004,2005,2006,2008,2009
-#      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
@@ -13,9 +12,8 @@
 # Lesser General Public License for more details.
 
 # You should have received a copy of the GNU Lesser General Public
-# License along with the GNU C Library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
+# License along with the GNU C Library; if not, see
+# <http://www.gnu.org/licenses/>.
 
 #
 #      Master Makefile for the GNU C library
@@ -33,25 +31,16 @@ all: lib others
 \f
 ifneq ($(AUTOCONF),no)
 
-ifeq ($(with-cvs),yes)
-define autoconf-it-cvs
-test ! -d CVS || cvs $(CVSOPTS) commit -m'Regenerated: autoconf $(ACFLAGS) $<' $@
-endef
-else
-autoconf-it-cvs =
-endif
-
 define autoconf-it
 @-rm -f $@.new
 $(AUTOCONF) $(ACFLAGS) $< > $@.new
 chmod a-w$(patsubst %,$(comma)a+x,$(filter .,$(@D))) $@.new
 mv -f $@.new $@
-$(autoconf-it-cvs)
 endef
 
-configure: configure.in aclocal.m4; $(autoconf-it)
-%/configure: %/configure.in aclocal.m4; $(autoconf-it)
-%/preconfigure: %/preconfigure.in aclocal.m4; $(autoconf-it)
+configure: configure.ac aclocal.m4; $(autoconf-it)
+%/configure: %/configure.ac aclocal.m4; $(autoconf-it)
+%/preconfigure: %/preconfigure.ac aclocal.m4; $(autoconf-it)
 
 endif # $(AUTOCONF) = no
 
@@ -63,14 +52,14 @@ endif # $(AUTOCONF) = no
 +subdir_targets        := subdir_lib objects objs others subdir_mostlyclean    \
                   subdir_clean subdir_distclean subdir_realclean       \
                   tests xtests subdir_lint.out                         \
-                  subdir_update-abi subdir_check-abi                   \
-                  subdir_echo-headers                                  \
+                  subdir_update-abi subdir_check-abi                   \
+                  subdir_echo-headers                                  \
                   subdir_install                                       \
                   subdir_objs subdir_stubs subdir_testclean            \
                   $(addprefix install-, no-libc.a bin lib data headers others)
 \f
 headers := limits.h values.h features.h gnu-versions.h bits/libc-lock.h \
-          bits/xopen_lim.h gnu/libc-version.h
+          bits/xopen_lim.h gnu/libc-version.h stdc-predef.h
 
 echo-headers: subdir_echo-headers
 
@@ -122,7 +111,7 @@ install:
 ifneq (no,$(PERL))
 ifeq (/usr,$(prefix))
 ifeq (,$(install_root))
-       CC="$(CC)" $(PERL) scripts/test-installation.pl $(common-objpfx)
+       LD_SO=$(ld.so-version) CC="$(CC)" $(PERL) scripts/test-installation.pl $(common-objpfx)
 endif
 endif
 endif
@@ -134,8 +123,8 @@ lib-noranlib: subdir_lib
 
 ifeq (yes,$(build-shared))
 # Build the shared object from the PIC object library.
-lib: $(common-objpfx)libc.so
-endif
+lib: $(common-objpfx)libc.so $(common-objpfx)linkobj/libc.so
+endif # $(build-shared)
 
 
 # This is a handy script for running any dynamically linked program against
@@ -143,8 +132,10 @@ endif
 $(common-objpfx)testrun.sh: $(common-objpfx)config.make \
                            $(..)Makeconfig $(..)Makefile
        (echo '#!/bin/sh'; \
-        echo "GCONV_PATH='$(common-objpfx)iconvdata' \\"; \
-        echo 'exec $(run-program-prefix) $${1+"$$@"}'; \
+        echo 'builddir=`dirname "$$0"`'; \
+        echo 'GCONV_PATH="$${builddir}/iconvdata" \'; \
+        echo 'exec $(subst $(common-objdir),"$${builddir}",\
+                           $(test-program-prefix)) $${1+"$$@"}'; \
        ) > $@T
        chmod a+x $@T
        mv -f $@T $@
@@ -159,14 +150,29 @@ others: $(common-objpfx)testrun.sh
 
 subdir-stubs := $(foreach dir,$(subdirs),$(common-objpfx)$(dir)/stubs)
 
-ifeq ($(biarch),no)
+ifndef abi-variants
 installed-stubs = $(inst_includedir)/gnu/stubs.h
 else
-installed-stubs = $(inst_includedir)/gnu/stubs-$(biarch).h
+installed-stubs = $(inst_includedir)/gnu/stubs-$(default-abi).h
 
-$(inst_includedir)/gnu/stubs.h: include/stubs-biarch.h $(+force)
+$(inst_includedir)/gnu/stubs.h: $(+force)
        $(make-target-directory)
-       $(INSTALL_DATA) $< $@
+       { \
+        echo '/* This file is automatically generated.';\
+        echo "   This file selects the right generated file of \`__stub_FUNCTION' macros";\
+        echo '   based on the architecture being compiled for.  */'; \
+        echo ''; \
+        $(foreach h,$(abi-includes), echo '#include <$(h)>';) \
+        echo ''; \
+        $(foreach v,$(abi-variants),\
+        $(if $(abi-$(v)-condition),\
+        echo '#if $(abi-$(v)-condition)'; \
+        echo '# include <gnu/stubs-$(v).h>'); \
+        $(if $(abi-$(v)-condition),echo '#endif';) \
+        rm -f $(@:.d=.h).new$(v); \
+        ) \
+       } > $(@:.d=.h).new
+       mv -f $(@:.d=.h).new $(@:.d=.h)
 
 install-others-nosubdir: $(installed-stubs)
 endif
@@ -246,25 +252,16 @@ tests-clean:
 
 tests: $(objpfx)c++-types-check.out $(objpfx)check-local-headers.out
 ifneq ($(CXX),no)
-check-data := $(firstword $(wildcard \
-               $(foreach D,$(add-ons) scripts,\
-                         $(patsubst %,$D/data/c++-types-%.data,\
-                                    $(abi-name) \
-                                    $(addsuffix -$(config-os),\
-                                                $(config-machine) \
-                                                $(base-machine))))))
-ifneq (,$(check-data))
-$(objpfx)c++-types-check.out: $(check-data) scripts/check-c++-types.sh
+
+vpath c++-types.data $(+sysdep_dirs)
+
+$(objpfx)c++-types-check.out: c++-types.data scripts/check-c++-types.sh
        scripts/check-c++-types.sh $< $(CXX) $(filter-out -std=gnu99 -Wstrict-prototypes,$(CFLAGS)) $(CPPFLAGS) > $@
-else
-$(objpfx)c++-types-check.out:
-       @echo 'WARNING C++ tests not run; create a c++-types-XXX file'
-       @echo "not run" > $@
-endif
 endif
 
 $(objpfx)check-local-headers.out: scripts/check-local-headers.sh
-       scripts/check-local-headers.sh "$(includedir)" "$(objpfx)" > $@
+       AWK='$(AWK)' scripts/check-local-headers.sh \
+         "$(includedir)" "$(objpfx)" > $@
 
 ifneq ($(PERL),no)
 installed-headers = argp/argp.h assert/assert.h catgets/nl_types.h \
@@ -351,7 +348,7 @@ TAGS:
 
 generated := $(generated) stubs.h
 
-files-for-dist := README FAQ INSTALL NOTES configure ChangeLog NEWS
+files-for-dist := README INSTALL configure ChangeLog NEWS
 
 # Regenerate stuff, then error if these things are not committed yet.
 dist-prepare: $(files-for-dist)
@@ -380,23 +377,21 @@ dist: dist-prepare
        fi
 endif
 
-define format-me
-@rm -f $@
-makeinfo --no-validate --plaintext --no-number-sections $< -o $@
--chmod a-w $@
-endef
-INSTALL: manual/install.texi; $(format-me)
-NOTES: manual/creature.texi; $(format-me)
-manual/dir-add.texi manual/dir-add.info: FORCE
-       $(MAKE) $(PARALLELMFLAGS) -C $(@D) $(@F)
-FAQ: scripts/gen-FAQ.pl FAQ.in
-       $(PERL) $^ > $@.new && rm -f $@ && mv $@.new $@ && chmod a-w $@
-ifeq ($(with-cvs),yes)
-       test ! -d CVS || cvs $(CVSOPTS) commit -m'Regenerated:  $(PERL) $^' $@
-endif
+INSTALL: manual/install-plain.texi manual/macros.texi \
+        $(common-objpfx)manual/pkgvers.texi manual/install.texi
+       makeinfo --no-validate --plaintext --no-number-sections \
+                -I$(common-objpfx)manual $< -o $@-tmp
+       $(AWK) 'NF == 0 { ++n; next } \
+               NF != 0 { while (n-- > 0) print ""; n = 0; print }' \
+         < $@-tmp > $@-tmp2
+       rm -f $@-tmp
+       -chmod a-w $@-tmp2
+       mv -f $@-tmp2 $@
+$(common-objpfx)manual/%: FORCE
+       $(MAKE) $(PARALLELMFLAGS) -C manual $@
 FORCE:
 
-iconvdata/% localedata/% po/% manual/%: FORCE
+iconvdata/% localedata/% po/%: FORCE
        $(MAKE) $(PARALLELMFLAGS) -C $(@D) $(@F)
 
 # glibc 2.0 contains some header files which aren't used with glibc 2.1
@@ -408,18 +403,18 @@ install: remove-old-headers
 endif
 endif
 
-headers2_0 :=  __math.h bytesex.h confname.h direntry.h elfclass.h     \
-               errnos.h fcntlbits.h huge_val.h ioctl-types.h           \
-               ioctls.h iovec.h jmp_buf.h libc-lock.h local_lim.h      \
-               mathcalls.h mpool.h nan.h ndbm.h posix1_lim.h           \
-               posix2_lim.h posix_opt.h resourcebits.h schedbits.h     \
-               selectbits.h semaphorebits.h sigaction.h sigcontext.h   \
-               signum.h sigset.h sockaddrcom.h socketbits.h stab.def   \
-               statbuf.h statfsbuf.h stdio-lock.h stdio_lim.h          \
-               syscall-list.h termbits.h timebits.h ustatbits.h        \
-               utmpbits.h utsnamelen.h waitflags.h waitstatus.h        \
-               xopen_lim.h gnu/types.h sys/ipc_buf.h                   \
-               sys/kernel_termios.h sys/msq_buf.h sys/sem_buf.h        \
+headers2_0 :=  __math.h bytesex.h confname.h direntry.h elfclass.h     \
+               errnos.h fcntlbits.h huge_val.h ioctl-types.h           \
+               ioctls.h iovec.h jmp_buf.h libc-lock.h local_lim.h      \
+               mathcalls.h mpool.h nan.h ndbm.h posix1_lim.h           \
+               posix2_lim.h posix_opt.h resourcebits.h schedbits.h     \
+               selectbits.h semaphorebits.h sigaction.h sigcontext.h   \
+               signum.h sigset.h sockaddrcom.h socketbits.h stab.def   \
+               statbuf.h statfsbuf.h stdio-lock.h stdio_lim.h          \
+               syscall-list.h termbits.h timebits.h ustatbits.h        \
+               utmpbits.h utsnamelen.h waitflags.h waitstatus.h        \
+               xopen_lim.h gnu/types.h sys/ipc_buf.h                   \
+               sys/kernel_termios.h sys/msq_buf.h sys/sem_buf.h        \
                sys/shm_buf.h sys/socketcall.h sigstack.h
 
 .PHONY: remove-old-headers