aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-05-27 10:29:02 +0000
committerUlrich Drepper <drepper@redhat.com>1998-05-27 10:29:02 +0000
commit7e7a548e7837d533f790b13c5b200549fe95c5b2 (patch)
tree573b41d834a6248bb318ad96339581b1fd25db8c
parent6598ac30319f3c5483c7bc95214c48b6442b53bd (diff)
downloadglibc-7e7a548e7837d533f790b13c5b200549fe95c5b2.zip
glibc-7e7a548e7837d533f790b13c5b200549fe95c5b2.tar.gz
glibc-7e7a548e7837d533f790b13c5b200549fe95c5b2.tar.bz2
Update.
1998-05-25 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * catgets/Makefile ($(objpfx)de.cat): Renamed from do-gencat-test. Use automatic variables. ($(objpfx)de.msg): Fix reference to po file. 1998-05-26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makeconfig ($(common-objpfx)gnu/lib-names.stmp): Use $(move-if-change). 1998-05-25 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * intl/dcgettext.c: Fix typo.
-rw-r--r--ChangeLog15
-rw-r--r--Makeconfig4
-rw-r--r--catgets/Makefile9
-rwxr-xr-xconfigure2
-rw-r--r--intl/dcgettext.c2
-rw-r--r--sysdeps/mach/hurd/dl-sysdep.c213
6 files changed, 92 insertions, 153 deletions
diff --git a/ChangeLog b/ChangeLog
index 10fd749..80996a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+1998-05-25 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
+
+ * catgets/Makefile ($(objpfx)de.cat): Renamed from
+ do-gencat-test. Use automatic variables.
+ ($(objpfx)de.msg): Fix reference to po file.
+
+1998-05-26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
+
+ * Makeconfig ($(common-objpfx)gnu/lib-names.stmp): Use
+ $(move-if-change).
+
+1998-05-25 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
+
+ * intl/dcgettext.c: Fix typo.
+
1998-05-25 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* configure.in: Allow more make versions e.g 3.76.90.
diff --git a/Makeconfig b/Makeconfig
index 6a0d2b7..ebe0723 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -716,9 +716,7 @@ $(common-objpfx)gnu/lib-names.stmp: $(common-objpfx)soversions.mk
done;) | sort; \
echo; \
echo '#endif /* gnu/lib-names.h */';) > ${@:stmp=T}
- if test -r ${@:stmp=h} && cmp -s ${@:stmp=h} ${@:stmp=T}; \
- then rm -f ${@:stmp=T}; \
- else mv -f ${@:stmp=T} ${@:stmp=h}; fi
+ $(move-if-change) ${@:stmp=T} ${@:stmp=h}
touch $@
common-generated += gnu/lib-names.h gnu/lib-names.stmp
diff --git a/catgets/Makefile b/catgets/Makefile
index 7ce634f..d6646f3 100644
--- a/catgets/Makefile
+++ b/catgets/Makefile
@@ -43,13 +43,12 @@ CPPFLAGS := -DNLSPATH='"$(localedir)/%L/%N:$(localedir)/%L/LC_MESSAGES/%N:$(loca
generated = de.msg de.cat
-.PHONY: do-gencat-test
-tests: do-gencat-test
+tests: $(objpfx)de.cat
# This test just checks whether the program produces any error or not.
# The result is not tested.
-do-gencat-test: $(objpfx)de.msg $(objpfx)gencat
- $(built-program-cmd) $(objpfx)de.cat $(objpfx)de.msg
+$(objpfx)de.cat: $(objpfx)de.msg $(objpfx)gencat
+ $(built-program-cmd) $@ $<
# Generate a non-simple input file.
-$(objpfx)de.msg: $(..)/po/de.po
+$(objpfx)de.msg: $(..)po/de.po
sed -f xopen-msg.sed $< > $@
diff --git a/configure b/configure
index cb9c48f..cdc0c9d 100755
--- a/configure
+++ b/configure
@@ -1333,7 +1333,7 @@ echo "configure:1333: checking version of $MAKE" >&5
ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*version \([0-9][0-9.]*\), by.*$/\1/p'`
case $ac_prog_version in
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
- 3.75 | 3.76.[1-9] | 3.7[789]* | 3.[89]*)
+ 3.75 | 3.76.[1-9]* | 3.7[789]* | 3.[89]*)
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
diff --git a/intl/dcgettext.c b/intl/dcgettext.c
index 2369285..2a2b895 100644
--- a/intl/dcgettext.c
+++ b/intl/dcgettext.c
@@ -29,7 +29,7 @@
# define alloca __builtin_alloca
# define HAVE_ALLOCA 1
#else
-# if (defined HAVE_ALLOCA_H || defined _LIBC && !defined C_ALLOCA
+# if (defined HAVE_ALLOCA_H || defined _LIBC) && !defined C_ALLOCA
# include <alloca.h>
# else
# ifdef _AIX
diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
index 6fd6ea3..c380256 100644
--- a/sysdeps/mach/hurd/dl-sysdep.c
+++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -215,79 +215,6 @@ _dl_sysdep_start_cleanup (void)
__mach_port_deallocate (__mach_task_self (), __mach_task_self_);
}
-void
-_dl_sysdep_fatal (const char *msg, ...)
-{
- va_list ap;
-
- va_start (ap, msg);
- do
- {
- size_t len = strlen (msg);
- mach_msg_type_number_t nwrote;
- do
- {
- if (__io_write (_hurd_init_dtable[2], msg, len, -1, &nwrote))
- break;
- len -= nwrote;
- msg += nwrote;
- } while (nwrote > 0);
- msg = va_arg (ap, const char *);
- } while (msg);
- va_end (ap);
-
- _exit (127);
-}
-
-
-void
-_dl_sysdep_error (const char *msg, ...)
-{
- va_list ap;
-
- va_start (ap, msg);
- do
- {
- size_t len = strlen (msg);
- mach_msg_type_number_t nwrote;
- do
- {
- if (__io_write (_hurd_init_dtable[2], msg, len, -1, &nwrote))
- break;
- len -= nwrote;
- msg += nwrote;
- } while (nwrote > 0);
- msg = va_arg (ap, const char *);
- } while (msg);
- va_end (ap);
-}
-
-
-void
-_dl_sysdep_message (const char *msg, ...)
-{
- va_list ap;
-
- va_start (ap, msg);
- do
- {
- size_t len = strlen (msg);
- mach_msg_type_number_t nwrote;
- do
- {
- if (__io_write (_hurd_init_dtable[1], msg, len, -1, &nwrote))
- break;
- len -= nwrote;
- msg += nwrote;
- } while (nwrote > 0);
- msg = va_arg (ap, const char *);
- } while (msg);
- va_end (ap);
-}
-
- /* Minimal open/close/mmap implementation sufficient for initial loading of
- shared libraries. These are weak definitions so that when the
- dynamic linker re-relocates itself to be user-visible (for -ldl),
/* Minimal open/close/mmap implementation sufficient for initial loading of
shared libraries. These are weak definitions so that when the
dynamic linker re-relocates itself to be user-visible (for -ldl),
@@ -572,76 +499,6 @@ __mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
(flags & MAP_SHARED) ? VM_INHERIT_SHARE : VM_INHERIT_COPY);
if (err == KERN_NO_SPACE && (flags & MAP_FIXED))
{
-
-void weak_function
-_dl_sysdep_fatal (const char *msg, ...)
-{
- va_list ap;
-
- va_start (ap, msg);
- do
- {
- size_t len = strlen (msg);
- mach_msg_type_number_t nwrote;
- do
- {
- if (__io_write (_hurd_init_dtable[2], msg, len, -1, &nwrote))
- break;
- len -= nwrote;
- msg += nwrote;
- } while (nwrote > 0);
- msg = va_arg (ap, const char *);
- } while (msg);
- va_end (ap);
-
- _exit (127);
-}
-
-
-void weak_function
-_dl_sysdep_error (const char *msg, ...)
-{
- va_list ap;
-
- va_start (ap, msg);
- do
- {
- size_t len = strlen (msg);
- mach_msg_type_number_t nwrote;
- do
- {
- if (__io_write (_hurd_init_dtable[2], msg, len, -1, &nwrote))
- break;
- len -= nwrote;
- msg += nwrote;
- } while (nwrote > 0);
- msg = va_arg (ap, const char *);
- } while (msg);
- va_end (ap);
-}
-
-
-void weak_function
-_dl_sysdep_message (const char *msg, ...)
-{
- va_list ap;
-
- va_start (ap, msg);
- do
- {
- size_t len = strlen (msg);
- mach_msg_type_number_t nwrote;
- do
- {
- if (__io_write (_hurd_init_dtable[1], msg, len, -1, &nwrote))
- break;
- len -= nwrote;
- msg += nwrote;
- } while (nwrote > 0);
- msg = va_arg (ap, const char *);
- } while (msg);
- va_end (ap);
-}
/* XXX this is not atomic as it is in unix! */
/* The region is already allocated; deallocate it first. */
err = __vm_deallocate (__mach_task_self (), mapaddr, len);
@@ -723,3 +580,73 @@ _dl_show_auxv (void)
{
/* There is nothing to print. Hurd has no auxiliary vector. */
}
+
+void weak_function
+_dl_sysdep_fatal (const char *msg, ...)
+{
+ va_list ap;
+
+ va_start (ap, msg);
+ do
+ {
+ size_t len = strlen (msg);
+ mach_msg_type_number_t nwrote;
+ do
+ {
+ if (__io_write (_hurd_init_dtable[2], msg, len, -1, &nwrote))
+ break;
+ len -= nwrote;
+ msg += nwrote;
+ } while (nwrote > 0);
+ msg = va_arg (ap, const char *);
+ } while (msg);
+ va_end (ap);
+
+ _exit (127);
+}
+
+
+void weak_function
+_dl_sysdep_error (const char *msg, ...)
+{
+ va_list ap;
+
+ va_start (ap, msg);
+ do
+ {
+ size_t len = strlen (msg);
+ mach_msg_type_number_t nwrote;
+ do
+ {
+ if (__io_write (_hurd_init_dtable[2], msg, len, -1, &nwrote))
+ break;
+ len -= nwrote;
+ msg += nwrote;
+ } while (nwrote > 0);
+ msg = va_arg (ap, const char *);
+ } while (msg);
+ va_end (ap);
+}
+
+
+void weak_function
+_dl_sysdep_message (const char *msg, ...)
+{
+ va_list ap;
+
+ va_start (ap, msg);
+ do
+ {
+ size_t len = strlen (msg);
+ mach_msg_type_number_t nwrote;
+ do
+ {
+ if (__io_write (_hurd_init_dtable[1], msg, len, -1, &nwrote))
+ break;
+ len -= nwrote;
+ msg += nwrote;
+ } while (nwrote > 0);
+ msg = va_arg (ap, const char *);
+ } while (msg);
+ va_end (ap);
+}