Update.
[platform/upstream/glibc.git] / Rules
diff --git a/Rules b/Rules
index f44ae91..d99bb21 100644 (file)
--- a/Rules
+++ b/Rules
@@ -1,20 +1,20 @@
-# Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+# Copyright (C) 1991,92,93,94,95,96,97,98,99,2000 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
-# modify it under the terms of the GNU Library General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
 
 # The GNU C Library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# Lesser General Public License for more details.
 
-# You should have received a copy of the GNU Library General Public
-# License along with the GNU C Library; see the file COPYING.LIB.  If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# 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.
 
 #
 #      Rules for making a subdirectory in the GNU C library.
@@ -41,7 +41,8 @@ all: objs lib others
 
 ifeq ($(build-programs),yes)
 others: $(addprefix $(objpfx),$(extra-objs) \
-                             $(install-lib) $(install-bin) \
+                             $(install-lib) \
+                             $(install-bin) $(install-bin-script) \
                              $(install-rootsbin) $(install-sbin))
 else
 others: $(addprefix $(objpfx),$(extra-objs) \
@@ -74,11 +75,9 @@ endef
 
 $(common-objpfx)dummy.c:
        rm -f $@
-       echo 'void __dummy__ (void) { }' > $@
-$(common-objpfx)empty.c:
-       cp -f /dev/null $@
-common-generated += dummy.o dummy.c empty.c \
-                   $(addprefix empty,$(object-suffixes))
+       (echo 'extern void __dummy__ (void);'; \
+        echo 'void __dummy__ (void) { }') > $@
+common-generated += dummy.o dummy.c
 \f
 # This makes all the auxiliary and test programs.
 
@@ -90,22 +89,19 @@ others: $(addprefix $(objpfx),$(extra-objs))
 endif
 ifeq ($(cross-compiling),yes)
 tests: $(addprefix $(objpfx),$(tests) $(test-srcs))
-ifeq ($(build-static),yes)
-tests: $(addprefix $(objpfx),$(tests-static))
-endif
 else
-tests: $(tests:%=$(objpfx)%.out)
-ifeq ($(build-static),yes)
-tests: $(tests-static:%=$(objpfx)%.sout)
+ifeq ($(build-bounded),yes)
+tests-bp.out = $(tests:%=$(objpfx)%-bp.out)
 endif
+tests: $(tests:%=$(objpfx)%.out) $(tests-bp.out)
 endif
 
 ifeq ($(build-programs),yes)
 binaries-all = $(others) $(sysdep-others) $(tests) $(test-srcs)
-binaries-static = $(others-static) $(tests-static) $(test-srcs-static)
+binaries-static = $(others-static) $(tests-static)
 else
 binaries-all = $(tests) $(test-srcs)
-binaries-static = $(tests-static) $(test-srcs-static)
+binaries-static =
 endif
 
 binaries-shared = $(filter-out $(binaries-static), $(binaries-all))
@@ -124,38 +120,36 @@ $(addprefix $(objpfx),$(binaries-static)): %: %.o \
        $(+link-static)
 endif
 
+ifeq ($(build-bounded),yes)
+binaries-bounded = $(addsuffix -bp,$(tests) $(test-srcs))
+$(addprefix $(objpfx),$(binaries-bounded)): %-bp: %.ob \
+  $(sort $(filter $(common-objpfx)lib%,$(link-libc-bounded))) \
+  $(addprefix $(csu-objpfx),start.ob) $(+preinit) $(+postinit)
+       $(+link-bounded)
+endif
+
 ifneq "$(strip $(tests) $(test-srcs))" ""
 # These are the implicit rules for making test outputs
 # from the test programs and whatever input files are present.
-$(objpfx)%.out: %.args $(objpfx)% %.input
-       $($*-ENV) $(built-program-cmd) `cat $(word 1,$^)` < $(word 3,$^) > $@
-$(objpfx)%.out: %.args $(objpfx)%
-       $($*-ENV) $(built-program-cmd) `cat $(word 1,$^)` > $@
+
+make-test-out = GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
+               $($*-ENV) $(built-program-cmd) $($*-ARGS)
+$(objpfx)%-bp.out: %.input $(objpfx)%-bp
+       $(make-test-out) > $@ < $(word 1,$^)
 $(objpfx)%.out: %.input $(objpfx)%
-       $($*-ENV) $(built-program-cmd) < $(word 1,$^) > $@
+       $(make-test-out) > $@ < $(word 1,$^)
 $(objpfx)%.out: /dev/null $(objpfx)%   # Make it 2nd arg for canned sequence.
-       $($*-ENV) $(built-program-cmd) > $@
-endif  # tests
+       $(make-test-out) > $@
 
-ifneq "$(strip $(tests-static) $(test-static-srcs))" ""
-# These are the implicit rules for making test outputs
-# from the test programs and whatever input files are present.
-$(objpfx)%.sout: %.args $(objpfx)% %.input
-       $($*-ENV) $(built-program-file) `cat $(word 1,$^)` < $(word 3,$^) > $@
-$(objpfx)%.sout: %.args $(objpfx)%
-       $($*-ENV) $(built-program-file) `cat $(word 1,$^)` > $@
-$(objpfx)%.sout: %.input $(objpfx)%
-       $($*-ENV) $(built-program-file) < $(word 1,$^) > $@
-$(objpfx)%.sout: /dev/null $(objpfx)%  # Make it 2nd arg for canned sequence.
-       $($*-ENV) $(built-program-file) > $@
 endif  # tests
 \f
 .PHONY: distclean realclean subdir_distclean subdir_realclean \
-       subdir_clean subdir_mostlyclean
+       subdir_clean subdir_mostlyclean subdir_testclean
 subdir_mostlyclean: mostlyclean
 subdir_clean: clean
 subdir_distclean: distclean
 subdir_realclean: realclean
+subdir_testclean: do-tests-clean
 realclean: distclean
 distclean: clean
 
@@ -187,19 +181,8 @@ generated: $(addprefix $(common-objpfx),$(common-generated)) \
 .PHONY: before-compile
 before-compile: $(before-compile)
 
-define o-iterator-doit
-$(common-objpfx)empty$o: $(common-objpfx)empty.c $(before-compile);
-       $$(compile-command.c)
-endef
-object-suffixes-left := $(object-suffixes)
-include $(o-iterator)
-
-define o-iterator-doit
-$(common-objpfx)dummy$o: $(common-objpfx)dummy.c $(before-compile);
-       $$(compile-command.c)
-endef
-object-suffixes-left := $(object-suffixes)
-include $(o-iterator)
+$(common-objpfx)dummy.o: $(common-objpfx)dummy.c $(before-compile);
+       $(compile-command.c)
 
 # There's no good place to put this - here will do.
 # The dependencies are wrong if it's run from the top level.
@@ -214,33 +197,48 @@ TMP_MAX   = 238328
 L_ctermid = 9
 L_cuserid = 9
 endif
+stdio_lim = $(common-objpfx)bits/stdio_lim.h
 
-$(common-objpfx)bits/stdio_%.h $(common-objpfx)bits/stdio_%.d:                 \
-                       $(..)stdio-common/stdio_%.h.in
+$(stdio_lim:lim.h=%.h) $(stdio_lim:lim.h=%.d): $(stdio_lim:lim.h=%.st); @:
+$(stdio_lim:h=st): $(..)stdio-common/stdio_lim.h.in $(..)Rules \
+                  $(common-objpfx)config.make
        $(make-target-directory)
        echo '#include "$(..)posix/bits/posix1_lim.h"' |                \
-       SUNPRO_DEPENDENCIES='$(@:.h=.d)T MARKER'                        \
-       $(CC) $(+includes) -E -dM -xc - -o $(@:.d=.h)T
-       sed -e 's!MARKER!$(@:.h=.d) $(@:.d=.h)!'                        \
-           -e 's!$(common-objpfx)!$$(common-objpfx)!g'                 \
-               $(@:.h=.d)T > $(@:.h=.d)t
-       mv -f $(@:.h=.d)t $(@:.h=.d)
-       fopen_max=`sed -n 's/^#define OPEN_MAX //p' $(@:.d=.h)T`;       \
-       filename_max=`sed -n 's/^#define PATH_MAX //p' $(@:.d=.h)T`;    \
+       SUNPRO_DEPENDENCIES='$(@:st=dT) $@'                             \
+       $(CC) $(+includes) -E -dM -xc - -o $(@:st=hT)
+       echo '#include "$(..)misc/sys/uio.h"' |                         \
+       SUNPRO_DEPENDENCIES='$(@:st=dT) $@'                             \
+       $(CC) -D_LIBC=1 $(+includes) -E -dM -xc - | cat - >> $(@:st=hT)
+ifdef sed-remove-objpfx
+       sed $(sed-remove-objpfx) $(@:st=dT) > $(@:st=dt)
+       cat $(@:st=dt) >> $(@:st=d)
+else
+       cat $(@:st=dT) >> $(@:st=d)
+endif
+       fopen_max=`sed -n 's/^#define OPEN_MAX //1p' $(@:st=hT)`;       \
+       filename_max=`sed -n 's/^#define PATH_MAX //1p' $(@:st=hT)`;    \
+       iov_max=`sed -n 's/^#define UIO_MAXIOV //p' $(@:st=hT)`;        \
        fopen_max=$${fopen_max:-16};                                    \
        filename_max=$${filename_max:-1024};                            \
+       if [ -z $$iov_max ]; then                                       \
+         define_iov_max="# undef IOV_MAX";                             \
+       else                                                            \
+         define_iov_max="# define IOV_MAX $$iov_max";                  \
+       fi;                                                             \
        sed -e "s/@FOPEN_MAX@/$$fopen_max/"                             \
            -e "s/@FILENAME_MAX@/$$filename_max/"                       \
            -e "s/@L_tmpnam@/$(L_tmpnam)/"                              \
            -e "s/@TMP_MAX@/$(TMP_MAX)/"                                \
            -e "s/@L_ctermid@/$(L_ctermid)/"                            \
            -e "s/@L_cuserid@/$(L_cuserid)/"                            \
-           $< > $(@:.d=.h).new
-       mv -f $(@:.d=.h).new $(@:.d=.h)
+           -e "s/@define_IOV_MAX@/$$define_iov_max/"                   \
+           $< > $(@:st=h.new)
+       $(move-if-change) $(@:st=h.new) $(@:st=h)
 # Remove these last so that they can be examined if something went wrong.
-       rm -f $(@:.d=.h)T $(@:.h=.d)T
+       rm -f $(@:st=hT) $(@:st=dT) $(@:st=dt)
+       touch $@
 # Get dependencies.
 ifndef no_deps
--include $(common-objpfx)bits/stdio_lim.d
+-include $(stdio_lim:h=d)
 endif
-common-generated += bits/stdio_lim.h bits/stdio_lim.d
+common-generated += bits/stdio_lim.h bits/stdio_lim.d bits/stdio_lim.st