summary refs log tree commit diff
path: root/iconvdata
diff options
context:
space:
mode:
Diffstat (limited to 'iconvdata')
-rw-r--r--iconvdata/Makefile5
-rw-r--r--iconvdata/gconv-modules4
2 files changed, 7 insertions, 2 deletions
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index b95d3a4086..e7a8dbdd70 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -45,7 +45,7 @@ modules	:= ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5		 \
 	   INIS-CYRILLIC ISO_6937-2 ISO_2033 ISO_5427 ISO_5427-EXT	 \
 	   ISO_5428 ISO_10367-BOX MAC-IS MAC-UK NATS-DANO NATS-SEFI	 \
 	   SAMI-WS2 ISO-IR-197 TIS-620 KOI8-U GBK ISIRI-3342 GBGBK	 \
-	   ISO-2022-CN libISOIR165 UTF-16 UNICODE BIG5HKSCS
+	   ISO-2022-CN libISOIR165 UTF-16 UNICODE BIG5HKSCS GB18030
 
 modules.so := $(addsuffix .so, $(modules))
 
@@ -118,7 +118,8 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk		    \
 	      macintosh.c mac-is.c mac-uk.c nats-dano.c nats-sefi.c sjis.c  \
 	      t.61.c uhc.c sami-ws2.c iso-ir-197.c tis-620.c koi8-u.c	    \
 	      isiri-3342.c gbgbk.c iso-2022-cn.c cns11643l2.h iso8859-16.c  \
-	      utf-16.c unicode.c big5hkscs.c iso-ir-165.c iso-ir-165.h
+	      utf-16.c unicode.c big5hkscs.c iso-ir-165.c iso-ir-165.h	    \
+	      gb18030.c
 
 # We build the transformation modules only when we build shared libs.
 ifeq (yes,$(build-shared))
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index 0206799f8a..725f45d3c9 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -1193,3 +1193,7 @@ module	INTERNAL		UTF-16BE//		UTF-16		1
 alias	CSUNICODE//		UNICODE//
 module	UNICODE//		INTERNAL		UNICODE		1
 module	INTERNAL		UNICODE//		UNICODE		1
+
+#	from			to			module		cost
+module	GB18030//		INTERNAL		GB18030		1
+module	INTERNAL		GB18030//		GB18030		1