Update.

	* iconvdata/Makefile: iconv-rules: Add definition to use gconv.map
	linker map for all iconv modules.
	(distribute): Add gconv.map.
	* iconvdata/gconv.map: New file.

diff --git a/ChangeLog b/ChangeLog
index 56840096cafa3d6a3b0c19f54fe178036afaf1f9..0b0101ad7522af2421bf0d0d1c0569ce0294ca1c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-12-12  Ulrich Drepper  <drepper@redhat.com>
 
+       * iconvdata/Makefile: iconv-rules: Add definition to use gconv.map
+       linker map for all iconv modules.
+       (distribute): Add gconv.map.
+       * iconvdata/gconv.map: New file.
+
        * elf/Makefile: Also check all iconv modules for text relocations.
 
        * stdlib/Makefile: Remove code to automatically import GMP.

diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 0978a105e9383fa2660647fcf0dfe7dd30cb39ec..9584d4d5ed630726d8f9e520eb3bdae76b3f4b5b 100644 (file)
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -110,7 +110,7 @@ LDFLAGS-libCNS.so = $(LDFLAGS-soname-fname)
 LDFLAGS-libISOIR165.so = $(LDFLAGS-soname-fname)
 LDFLAGS-libJISX0213.so = $(LDFLAGS-soname-fname)
 
-distribute := gconv-modules extra-module.mk gap.awk gaptab.awk             \
+distribute := gconv-modules extra-module.mk gap.awk gaptab.awk gconv.map    \
              gen-8bit.sh gen-8bit-gap.sh gen-8bit-gap-1.sh                 \
              TESTS $(filter-out testdata/CVS%, $(wildcard testdata/*))     \
              TESTS2 run-iconv-test.sh tst-tables.sh tst-table.sh           \
@@ -249,8 +249,10 @@ $(objpfx)iconv-rules: Makefile
          echo 8bit $(gen-8bit-modules); \
          echo 8bit-gap $(gen-8bit-gap-modules); } | \
        $(AWK) 'NR == 1 { \
-                 for (i = 1; i <= NF; i++) \
+                 for (i = 1; i <= NF; i++) { \
                    printf "%s-routines := %s\n", $$i, tolower($$i); \
+                   printf "%s-map := gconv.map\n", $$i; \
+                 } \
                }; \
                NR > 1 { \
                  for (i = 2; i <= NF; i++) { \

diff --git a/iconvdata/gconv.map b/iconvdata/gconv.map
new file mode 100644 (file)
index 0000000..4274073
--- /dev/null
+++ b/iconvdata/gconv.map
@@ -0,0 +1,7 @@
+{
+global:
+  gconv;
+  gconv_init;
+local:
+  *;
+};