aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--Makerules2
-rw-r--r--iconvdata/gap.pl4
-rw-r--r--sysdeps/generic/dl-sysdep.c2
4 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8f9cdc8026..840aff48bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
1998-03-31 Ulrich Drepper <drepper@cygnus.com>
+ * sysdeps/generic/dl-sysdep.c (_dl_important_hwcaps): Fix typo.
+
+ * iconvdata/gap.pl: Avoid using %#06x.
+
+1998-03-31 19:55 Zack Weinberg <zack@rabi.phys.columbia.edu>
+
+ * Makerules: Use $? instead of S^ when invoking ar.
+
+1998-03-31 Ulrich Drepper <drepper@cygnus.com>
+
* db2/compat.h: Allow EFTYPE being defined.
* sysdeps/unix/bsd/bits/signum.h: Add definition for SIG_HOLD.
* sysdeps/unix/bsd/ulimit.c: Include <ulimit.h>.
diff --git a/Makerules b/Makerules
index 6c0af11756..c1b8a981c7 100644
--- a/Makerules
+++ b/Makerules
@@ -576,7 +576,7 @@ define do-ar
topdir=`cd $(..).; pwd`; \
$(patsubst %/,cd %;,$(objpfx)) \
$(SHELL) $$topdir/autolock.sh ${O%-lib}.lck $(AR) $(CREATE_ARFLAGS) ${O%-lib} \
- $(patsubst $(objpfx)%,%,$^)
+ $(patsubst $(objpfx)%,%,$?)
rm -f $@
touch $@
endef
diff --git a/iconvdata/gap.pl b/iconvdata/gap.pl
index ed2d295c90..8d595e327d 100644
--- a/iconvdata/gap.pl
+++ b/iconvdata/gap.pl
@@ -4,7 +4,7 @@ while (<>) {
local($u)=hex($ucs);
if ($u - $last > 6) {
if ($last != 0) {
- printf (" { start: %#06x, end: %#06x, idx: %5d },\n",
+ printf (" { start: 0x%04x, end: 0x%04x, idx: %5d },\n",
$first, $last, $idx - $first);
$idx += $last - $first + 1;
}
@@ -12,5 +12,5 @@ while (<>) {
}
$last=$u;
}
-printf (" { start: %#06x, end: %#06x, idx: %5d },\n",
+printf (" { start: 0x%04x, end: 0x%04x, idx: %5d },\n",
$first, $last, $idx - $first);
diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c
index 25a3dd23cd..e05d38d31c 100644
--- a/sysdeps/generic/dl-sysdep.c
+++ b/sysdeps/generic/dl-sysdep.c
@@ -335,7 +335,7 @@ _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz,
total = temp[0].len;
else
{
- total = (1 << (cnt - 2)) * (temp[0].len = temp[cnt - 1].len + 2);
+ total = (1 << (cnt - 2)) * (temp[0].len + temp[cnt - 1].len + 2);
for (n = 1; n + 1 < cnt; ++n)
total += (1 << (cnt - 3)) * (temp[n].len + 1);
}