update from main archive 960906

diff --git a/Makeconfig b/Makeconfig
index e62608d..38589e7 100644 (file)
--- a/Makeconfig
+++ b/Makeconfig
@@ -523,17 +523,23 @@ ifeq (yes, $(build-shared))
 # version numbers to use when we install shared objects on this system.
 -include $(common-objpfx)soversions.mk
 $(common-objpfx)soversions.mk: $(..)shlib-versions $(..)Makeconfig \
+                              $(wildcard $(patsubst %, $(..)%/shlib-versions,\
+                                                       $(add-ons))) \
                               $(common-objpfx)config.make
-       sed 's/#.*$$//' $< | while read conf versions; do \
-         test -n "$$versions" || continue; \
-         case '$(config-machine)-$(config-vendor)-$(config-os)' in $$conf)\
-           for v in $$versions; do \
-             lib=`echo $$v | sed 's/=.*$$//'`; \
-             if eval "test -z \"\$$vers_lib$$lib\""; then \
-               eval vers_lib$${lib}=yes; \
-               echo $$v | sed "s/^.*=/$$lib.so-version=./";  \
-             fi; \
-         done ;; esac; done > $@T; exit 0
+       (file="$(..)shlib-versions \
+              $(wildcard $(patsubst %,$(..)%/shlib-versions,$(add-ons)))"; \
+        for f in $$file; do \
+        sed 's/#.*$$//' $$f | while read conf versions; do \
+          test -n "$$versions" || continue; \
+          case '$(config-machine)-$(config-vendor)-$(config-os)' in $$conf)\
+            for v in $$versions; do \
+              lib=`echo $$v | sed 's/=.*$$//'`; \
+              if eval "test -z \"\$$vers_lib$$lib\""; then \
+                eval vers_lib$${lib}=yes; \
+                echo $$v | sed "s/^.*=/$$lib.so-version=./";  \
+              fi; \
+          done ;; esac; done; \
+        done;) > $@T; exit 0
        mv -f $@T $@
 
 # Get $(version) defined with the release version number.

diff --git a/Makefile b/Makefile
index b502895..039e3c9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ endif
 
 # This is the default target; it makes everything except the tests.
 .PHONY: all
-all: lib extra_solibs others
+all: lib others
 \f
 define autoconf-it
 @-rm -f $@.new
@@ -73,9 +73,9 @@ subdirs       := $(filter mach,$(subdirs)) $(filter hurd,$(subdirs)) \
 
 
 # These are the targets that are made by making them in each subdirectory.
-+subdir_targets        := subdir_lib extra_solibs objects objs others          \
-                  subdir_mostlyclean subdir_clean subdir_distclean     \
-                  subdir_realclean tests subdir_lint.out               \
++subdir_targets        := subdir_lib objects objs others subdir_mostlyclean    \
+                  subdir_clean subdir_distclean subdir_realclean       \
+                  tests subdir_lint.out                                \
                   subdir_distinfo                                      \
                   subdir_echo-headers subdir_echo-distinfo             \
                   subdir_install                                       \

diff --git a/Rules b/Rules
index 8984967..b6215f5 100644 (file)
--- a/Rules
+++ b/Rules
@@ -107,14 +107,13 @@ $(objpfx)%.out: /dev/null $(objpfx)%      # Make it 2nd arg for canned sequence.
 endif  # tests
 \f
 .PHONY: distclean realclean subdir_distclean subdir_realclean \
-       subdir_clean subdir_mostlyclean extra_solibs
+       subdir_clean subdir_mostlyclean
 subdir_mostlyclean: mostlyclean
 subdir_clean: clean
 subdir_distclean: distclean
 subdir_realclean: realclean
 realclean: distclean
 distclean: clean
-extra_solibs:
 
 .PHONY: subdir_echo-headers
 subdir_echo-headers: echo-headers

diff --git a/config.make.in b/config.make.in
index 614d1d2..c52910e 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -13,7 +13,7 @@ config-vendor = @host_vendor@
 config-os = @host_os@
 config-sysdirs = @sysnames@
 
-config-defines = @DEFS@
+defines = @DEFINES@
 
 elf = @elf@
 have-initfini = @libc_cv_have_initfini@

diff --git a/configure b/configure
index 68aa0d7..d2f0c3c 100755 (executable)
--- a/configure
+++ b/configure
@@ -1754,6 +1754,8 @@ fi
 
 
 
+
+
 if test "`(cd $srcdir; pwd)`" = "`pwd`"; then
   config_makefile=
 else
@@ -1912,6 +1914,7 @@ s%@elf@%$elf%g
 s%@shared@%$shared%g
 s%@profile@%$profile%g
 s%@omitfp@%$omitfp%g
+s%@DEFINES@%$DEFINES%g
 
 CEOF
 EOF

diff --git a/configure.in b/configure.in
index d5370f8..ce9f61d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -668,6 +668,8 @@ fi
 AC_SUBST(profile)
 AC_SUBST(omitfp)
 
+AC_SUBST(DEFINES)
+
 if test "`(cd $srcdir; pwd)`" = "`pwd`"; then
   config_makefile=
 else

diff --git a/extra-lib.mk b/extra-lib.mk
index 1db7520..e608894 100644 (file)
--- a/extra-lib.mk
+++ b/extra-lib.mk
@@ -28,7 +28,7 @@ alltypes-$(lib) := $(foreach o,$(object-suffixes-$(lib)),\
 ifeq (,$(filter $(lib),$(extra-libs-others)))
 lib-noranlib: $(alltypes-$(lib))
 ifeq (yes,$(build-shared))
-extra_solibs: $(objpfx)$(lib).so$($(lib).so-version)
+lib-noranlib: $(objpfx)$(lib).so$($(lib).so-version)
 endif
 else
 others: $(alltypes-$(lib))
@@ -37,7 +37,7 @@ endif
 # The linked shared library is never a dependent of lib-noranlib,
 # because linking it will depend on libc.so already being built.
 ifneq (,$(filter .so,$(object-suffixes-$(lib))))
-extra_solibs: $(objpfx)$(lib).so
+others: $(objpfx)$(lib).so
 endif
 
 

diff --git a/features.h b/features.h
index 4aee806..47a4124 100644 (file)
--- a/features.h
+++ b/features.h
@@ -160,7 +160,9 @@ Cambridge, MA 02139, USA.  */
 
 
 /* This is here only because every header file already includes this one.  */
+#ifndef __ASSEMBLER__
 #include <sys/cdefs.h>
+#endif
 
 /* This is here only because every header file already includes this one.  */
 #ifndef _LIBC

diff --git a/libc-symbols.h b/libc-symbols.h
index 2f72d5f..c64d882 100644 (file)
--- a/libc-symbols.h
+++ b/libc-symbols.h
@@ -202,6 +202,7 @@ extern const char _libc_intl_domainname[];
 /* This comes between the return type and function name in
    a function definition to make that definition weak.  */
 #define weak_function __attribute__ ((weak))
+#define weak_const_function __attribute__ ((weak, __const__))
 
 #endif /* HAVE_WEAK_SYMBOLS.  */
 #endif /* Not ASSEMBLER, and GCC 2.7 or later.  */
@@ -213,6 +214,7 @@ extern const char _libc_intl_domainname[];
    directive for the function symbol, and a `.weak' directive in addition
    will produce an error from the assembler.  */
 #define weak_function /* empty */
+#define weak_const_function /* empty */
 #endif