summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--Rules2
-rw-r--r--iconvdata/gconv-modules9
-rwxr-xr-xiconvdata/tst-table.sh2
-rwxr-xr-xiconvdata/tst-tables.sh2
5 files changed, 24 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5295a7f61c..5d654a63de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,20 @@
+2000-10-15 Pete Wyckoff <pw@osc.edu>
+
+ * Rules: Define _LIBC during generation of bits/stdio_lim.d.
+
+2000-10-15 Pete Wyckoff <pw@osc.edu>
+
+ * iconvdata/tst-tables.sh: Invoke other shell scripts through ${SHELL}.
+ * iconvdata/tst-table.sh: Likewise.
+
2000-10-15 Ulrich Drepper <drepper@redhat.com>
* elf/dl-error.c (_dl_signal_error): Allocate memory for objname
as well. Reported by Alexander V. Lukyanov <lav@yars.free.net>.
+ * iconvdata/gconv-modules: Add aliases for Winblowz charsets.
+ Patch by Joseph S. Myers <jsm28@cam.ac.uk>.
+
2000-10-13 Andreas Schwab <schwab@suse.de>
* elf/elf.h (R_IA64_PCREL60B): Add relocation.
diff --git a/Rules b/Rules
index 41970234ae..956a2eb62e 100644
--- a/Rules
+++ b/Rules
@@ -206,7 +206,7 @@ $(stdio_lim:h=st): $(..)stdio-common/stdio_lim.h.in $(..)Rules \
$(CC) $(+includes) -E -dM -xc - -o $(@:st=hT)
echo '#include "$(..)misc/sys/uio.h"' | \
SUNPRO_DEPENDENCIES='$(@:st=dT) $@' \
- $(CC) $(+includes) -E -dM -xc - | cat - >> $(@:st=hT)
+ $(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)
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index 30355f8cc9..a1e855bd94 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -919,45 +919,54 @@ module INTERNAL EUC-TW// EUC-TW 1
# from to module cost
alias MS-EE// CP1250//
+alias WINDOWS-1250// CP1250//
module CP1250// INTERNAL CP1250 1
module INTERNAL CP1250// CP1250 1
# from to module cost
alias MS-CYRL// CP1251//
+alias WINDOWS-1251// CP1251//
module CP1251// INTERNAL CP1251 1
module INTERNAL CP1251// CP1251 1
# from to module cost
alias MS-ANSI// CP1252//
+alias WINDOWS-1252// CP1252//
module CP1252// INTERNAL CP1252 1
module INTERNAL CP1252// CP1252 1
# from to module cost
alias MS-GREEK// CP1253//
+alias WINDOWS-1253// CP1253//
module CP1253// INTERNAL CP1253 1
module INTERNAL CP1253// CP1253 1
# from to module cost
alias MS-TURK// CP1254//
+alias WINDOWS-1254// CP1254//
module CP1254// INTERNAL CP1254 1
module INTERNAL CP1254// CP1254 1
# from to module cost
alias MS-HEBR// CP1255//
+alias WINDOWS-1255// CP1255//
module CP1255// INTERNAL CP1255 1
module INTERNAL CP1255// CP1255 1
# from to module cost
alias MS-ARAB// CP1256//
+alias WINDOWS-1256// CP1256//
module CP1256// INTERNAL CP1256 1
module INTERNAL CP1256// CP1256 1
# from to module cost
alias WINBALTRIM// CP1257//
+alias WINDOWS-1257// CP1257//
module CP1257// INTERNAL CP1257 1
module INTERNAL CP1257// CP1257 1
# from to module cost
+alias WINDOWS-1258// CP1258//
module CP1258// INTERNAL CP1258 1
module INTERNAL CP1258// CP1258 1
diff --git a/iconvdata/tst-table.sh b/iconvdata/tst-table.sh
index 9b3fcc3dad..e38b88ee37 100755
--- a/iconvdata/tst-table.sh
+++ b/iconvdata/tst-table.sh
@@ -34,7 +34,7 @@ export LC_ALL
set -e
# Get the charmap.
-./tst-table-charmap.sh ${charmap:-$charset} \
+${SHELL} tst-table-charmap.sh ${charmap:-$charset} \
< ../localedata/charmaps/${charmap:-$charset} \
> ${objpfx}tst-${charset}.charmap.table
diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh
index d5a74621ce..6c63776087 100755
--- a/iconvdata/tst-tables.sh
+++ b/iconvdata/tst-tables.sh
@@ -209,7 +209,7 @@ while read charset charmap; do
if test "$charset" = GB18030; then echo "This might take a while" 1>&2; fi
case ${charset} in \#*) continue;; esac
echo -n "Testing ${charset}" 1>&2
- if ./tst-table.sh ${common_objpfx} ${objpfx} ${charset} ${charmap}; then
+ if ${SHELL} tst-table.sh ${common_objpfx} ${objpfx} ${charset} ${charmap}; then
echo 1>&2
else
echo "failed: ./tst-table.sh ${common_objpfx} ${objpfx} ${charset} ${charmap}"