2004-01-27 Artem B. Bityuckiy <abitytsky@softminecorp.com>

	* configure.in: Add support to generate iconv converter flags
	for newlib.h
	* newlib.hin: Add iconv converter flags.
	* configure: Regenerated.
	* libc/Makefile.in: Ditto.
	* libc/configure.in: Moved iconv converter parsing logic to
	top level newlib configure.in.
	* libc/configure: Regenerated.
	* libc/iconv/Makefile.in: Ditto.
	* libc/iconv/README.TODO
	* libc/iconv/charset.aliases: Remove wrong BE aliases for
	UCS2/UCS4/UTF8.
	* libc/iconv/ccs/Makefile.am: Remove C flag setting now that
	newlib.h can be used.
	* libc/iconv/ces/Makefile.am: Ditto.
	* libc/iconv/lib/Makefile.am: Ditto.
	* libc/iconv/ccs/Makefile.in: Regenerated.
	* libc/iconv/ces/Makefile.in: Ditto.
	* libc/iconv/lib/Makefile.in: Ditto.
	* libc/iconv/ccs/README.CCS.SOURCES: Updated.
	* libc/iconv/ccs/iconv_mktbl: Don't write junk strings to binaries.
	* libc/iconv/ccs/big5.c: Switch to use new underscored flags
	defined in newlib.h.
	* libc/iconv/ccs/cns11643_plane1.c: Ditto.
	* libc/iconv/ccs/cns11643_plane14.c: Ditto.
	* libc/iconv/ccs/cns11643_plane2.c: Ditto.
	* libc/iconv/ccs/cp775.c: Ditto.
	* libc/iconv/ccs/cp850.c: Ditto.
	* libc/iconv/ccs/cp852.c: Ditto.
	* libc/iconv/ccs/cp855.c: Ditto.
	* libc/iconv/ccs/cp866.c: Ditto.
	* libc/iconv/ccs/gb_2312_80.c: Ditto.
	* libc/iconv/ccs/iso_8859_1.c: Ditto.
	* libc/iconv/ccs/iso_8859_15.c: Ditto.
	* libc/iconv/ccs/iso_8859_2.c: Ditto.
	* libc/iconv/ccs/iso_8859_4.c: Ditto.
	* libc/iconv/ccs/iso_8859_5.c: Ditto.
	* libc/iconv/ccs/jis_x0201.c: Ditto.
	* libc/iconv/ccs/jis_x0208_1983.c: Ditto.
	* libc/iconv/ccs/jis_x0212_1990.c: Ditto.
	* libc/iconv/ccs/koi8_r.c: Ditto.
	* libc/iconv/ccs/koi8_u.c: Ditto.
	* libc/iconv/ccs/ksx1001.c: Ditto.
	* libc/iconv/ccs/shift_jis.c: Ditto.
	* libc/iconv/ccs/us_ascii.c: Ditto.
	* libc/iconv/ccs/binary/big5.cct: Newly generated.
	* libc/iconv/ccs/binary/cns11643_plane1.cct: Ditto.
	* libc/iconv/ccs/binary/cns11643_plane14.cct: Ditto.
	* libc/iconv/ccs/binary/cns11643_plane2.cct: Ditto.
	* libc/iconv/ccs/binary/cp775.cct: Ditto.
	* libc/iconv/ccs/binary/cp850.cct: Ditto.
	* libc/iconv/ccs/binary/cp852.cct: Ditto.
	* libc/iconv/ccs/binary/cp855.cct: Ditto.
	* libc/iconv/ccs/binary/cp866.cct: Ditto.
	* libc/iconv/ccs/binary/gb_2312_80.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_1.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_15.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_2.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_4.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_5.cct: Ditto.
	* libc/iconv/ccs/binary/jis_x0201.cct: Ditto.
	* libc/iconv/ccs/binary/jis_x0208_1983.cct: Ditto.
	* libc/iconv/ccs/binary/jis_x0212_1990.cct: Ditto.
	* libc/iconv/ccs/binary/koi8_r.cct: Ditto.
	* libc/iconv/ccs/binary/koi8_u.cct: Ditto.
	* libc/iconv/ccs/binary/ksx1001.cct: Ditto.
	* libc/iconv/ccs/binary/shift_jis.cct: Ditto.
	* libc/iconv/ccs/binary/us_ascii.cct: Ditto.
	* libc/iconv/lib/bialiasesi.c: Sync with charset.aliases.
	* libc/iconv/ces/euc-jp.c: Use newlib.h macros.
	* libc/iconv/ces/euc-kr.c: Ditto.
	* libc/iconv/ces/euc-tw.c: Ditto.
	* libc/iconv/ces/gb2312.c: Ditto.
	* libc/iconv/ces/iso-10646-ucs-2.c: Ditto.
	* libc/iconv/ces/iso-10646-ucs-4.c: Ditto.
	* libc/iconv/ces/ucs-2-internal.c: Ditto.
	* libc/iconv/ces/ucs-4-internal.c: Ditto.
	* libc/iconv/ces/utf-16.c: Ditto.
	* libc/iconv/ces/utf-8.c: Ditto.
	* libc/iconv/lib/aliases.c: Ditto.
	* libc/iconv/lib/biccs.c: Ditto.
	* libc/iconv/lib/bices.c: Ditto.
	* libc/iconv/lib/ccs.c: Ditto.
	* libc/iconv/lib/ces.c: Ditto.
	* libc/iconv/lib/ces_euc.c: Ditto.
	* libc/iconv/lib/ces_iso2022.c: Ditto.
	* libc/iconv/lib/ces_table.c: Ditto.
	* libc/iconv/lib/converter.c: Ditto.
	* libc/iconv/lib/deps.h: Ditto.
	* libc/iconv/lib/endian.h: Ditto.
	* libc/iconv/lib/iconv.c: Ditto.
	* libc/iconv/lib/loaddata.c: Ditto.
	* libc/iconv/lib/local.h: Include newlib.h.
	* libc/argz/Makefile.in: Regenerated.
	* libc/ctype/Makefile.in: Ditto.
	* libc/errno/Makefile.in: Ditto.
	* libc/iconv/ccs/binary/Makefile.in: Ditto.
	* libc/locale/Makefile.in: Ditto.
	* libc/misc/Makefile.in: Ditto.
	* libc/posix/Makefile.in: Ditto.
	* libc/reent/Makefile.in: Ditto.
	* libc/search/Makefile.in: Ditto.
	* libc/signal/Makefile.in: Ditto.
	* libc/stdio/Makefile.in: Ditto.
	* libc/stdio64/Makefile.in: Ditto.
	* libc/stdlib/Makefile.in: Ditto.
	* libc/string/Makefile.in: Ditto.
	* libc/syscalls/Makefile.in: Ditto.
	* libc/time/Makefile.in: Ditto.
	* libc/unix/Makefile.in: Ditto.
	* testsuite/newlib.iconv/iconv.exp: New file.
	* testsuite/newlib.iconv/iconvjp.c: Ditto.
	* testsuite/newlib.iconv/iconvnm.c: Ditto.
	* testsuite/newlib.iconv/iconvru.c: Ditto.

51 files changed, 82 insertions, 130 deletions

diff --git a/newlib/libc/iconv/ccs/Makefile.am b/newlib/libc/iconv/ccs/Makefile.am
index becd45aa0..2aaddd2e4 100644
--- a/newlib/libc/iconv/ccs/Makefile.am
+++ b/newlib/libc/iconv/ccs/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = cygnus
 
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(NEWLIB_ICONV_CFLAGS)
+INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 GENERAL_SOURCES = \
 	big5.c \
diff --git a/newlib/libc/iconv/ccs/Makefile.in b/newlib/libc/iconv/ccs/Makefile.in
index 12146434b..78348d274 100644
--- a/newlib/libc/iconv/ccs/Makefile.in
+++ b/newlib/libc/iconv/ccs/Makefile.in
@@ -92,7 +92,6 @@ LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-NEWLIB_ICONV_CFLAGS = @NEWLIB_ICONV_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -109,7 +108,7 @@ sys_dir = @sys_dir@
 
 AUTOMAKE_OPTIONS = cygnus
 
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(NEWLIB_ICONV_CFLAGS)
+INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 GENERAL_SOURCES =  	big5.c 	cp775.c 	cp850.c 	cp852.c 	cp855.c 	cp866.c 	gb_2312_80.c 	iso_8859_15.c 	iso_8859_1.c 	iso_8859_2.c 	iso_8859_4.c 	iso_8859_5.c 	jis_x0201.c 	jis_x0208_1983.c 	jis_x0212_1990.c 	koi8_r.c 	koi8_u.c 	ksx1001.c 	shift_jis.c 	cns11643_plane14.c 	cns11643_plane1.c 	cns11643_plane2.c 	us_ascii.c
 
diff --git a/newlib/libc/iconv/ccs/README.CCS.SOURCES b/newlib/libc/iconv/ccs/README.CCS.SOURCES
index ee473cc9d..97a24cd6e 100644
--- a/newlib/libc/iconv/ccs/README.CCS.SOURCES
+++ b/newlib/libc/iconv/ccs/README.CCS.SOURCES
@@ -1,6 +1,6 @@
 This directory contains CCS conversion tables - both C files and .cct files.
 .cct files are for dynamic loading, .c files are for static linking with Newlib.
-Both .c and .cct files are generated my 'iconv_mktbl' perl script from
+Both .c and .cct files are generated by 'iconv_mktbl' perl script from
 special source files (call them .txt files). These .txt files can be taken
 from Unicode.org site, addresses are given in the end.
 
diff --git a/newlib/libc/iconv/ccs/big5.c b/newlib/libc/iconv/ccs/big5.c
index 7e72e1c2e..db751c523 100644
--- a/newlib/libc/iconv/ccs/big5.c
+++ b/newlib/libc/iconv/ccs/big5.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_BIG5
+#ifdef _ICONV_CONVERTER_BIG5
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_big5[] = {
+_CONST unsigned char _iconv_ccs_table_big5[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 16, 3,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0xB6, 0x08),
 	_1l(0x00, 0x00, 0x04, 0x00), _1l(0x00, 0x00, 0x00, 0x00),
@@ -12297,6 +12296,5 @@ _CONST unsigned char iconv_ccs_table_big5[] = {
 	_2s(0xFF, 0xFE, 0xA2, 0xCE), _2s(0xFF, 0xFE, 0xFF, 0xFE),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_BIG5 */
+#endif /* #ifdef _ICONV_CONVERTER_BIG5 */
 
-#endif /* #ifdef ENABLE_ICONV */
diff --git a/newlib/libc/iconv/ccs/binary/Makefile.in b/newlib/libc/iconv/ccs/binary/Makefile.in
index 68548350b..f8db94ac1 100644
--- a/newlib/libc/iconv/ccs/binary/Makefile.in
+++ b/newlib/libc/iconv/ccs/binary/Makefile.in
@@ -92,7 +92,6 @@ LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-NEWLIB_ICONV_CFLAGS = @NEWLIB_ICONV_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/newlib/libc/iconv/ccs/binary/big5.cct b/newlib/libc/iconv/ccs/binary/big5.cct
index e9be588df..be6d2e898 100644
--- a/newlib/libc/iconv/ccs/binary/big5.cct
+++ b/newlib/libc/iconv/ccs/binary/big5.cct
diff --git a/newlib/libc/iconv/ccs/binary/cns11643_plane1.cct b/newlib/libc/iconv/ccs/binary/cns11643_plane1.cct
index e20ed7667..09b0e710a 100644
--- a/newlib/libc/iconv/ccs/binary/cns11643_plane1.cct
+++ b/newlib/libc/iconv/ccs/binary/cns11643_plane1.cct
diff --git a/newlib/libc/iconv/ccs/binary/cns11643_plane14.cct b/newlib/libc/iconv/ccs/binary/cns11643_plane14.cct
index f891f3395..26334b37c 100644
--- a/newlib/libc/iconv/ccs/binary/cns11643_plane14.cct
+++ b/newlib/libc/iconv/ccs/binary/cns11643_plane14.cct
diff --git a/newlib/libc/iconv/ccs/binary/cns11643_plane2.cct b/newlib/libc/iconv/ccs/binary/cns11643_plane2.cct
index 3a17c06c7..0523d651a 100644
--- a/newlib/libc/iconv/ccs/binary/cns11643_plane2.cct
+++ b/newlib/libc/iconv/ccs/binary/cns11643_plane2.cct
diff --git a/newlib/libc/iconv/ccs/binary/cp775.cct b/newlib/libc/iconv/ccs/binary/cp775.cct
index 5a019395e..f79e3f06a 100644
--- a/newlib/libc/iconv/ccs/binary/cp775.cct
+++ b/newlib/libc/iconv/ccs/binary/cp775.cct
diff --git a/newlib/libc/iconv/ccs/binary/cp850.cct b/newlib/libc/iconv/ccs/binary/cp850.cct
index 6f1493c0e..9b884b6ac 100644
--- a/newlib/libc/iconv/ccs/binary/cp850.cct
+++ b/newlib/libc/iconv/ccs/binary/cp850.cct
diff --git a/newlib/libc/iconv/ccs/binary/cp852.cct b/newlib/libc/iconv/ccs/binary/cp852.cct
index b37009e8c..f8f25c5ba 100644
--- a/newlib/libc/iconv/ccs/binary/cp852.cct
+++ b/newlib/libc/iconv/ccs/binary/cp852.cct
diff --git a/newlib/libc/iconv/ccs/binary/cp855.cct b/newlib/libc/iconv/ccs/binary/cp855.cct
index 0f3c8d91f..869ea9ee2 100644
--- a/newlib/libc/iconv/ccs/binary/cp855.cct
+++ b/newlib/libc/iconv/ccs/binary/cp855.cct
diff --git a/newlib/libc/iconv/ccs/binary/cp866.cct b/newlib/libc/iconv/ccs/binary/cp866.cct
index 9117d976f..57d2ac848 100644
--- a/newlib/libc/iconv/ccs/binary/cp866.cct
+++ b/newlib/libc/iconv/ccs/binary/cp866.cct
diff --git a/newlib/libc/iconv/ccs/binary/gb_2312_80.cct b/newlib/libc/iconv/ccs/binary/gb_2312_80.cct
index 8f9c4367a..033b817db 100644
--- a/newlib/libc/iconv/ccs/binary/gb_2312_80.cct
+++ b/newlib/libc/iconv/ccs/binary/gb_2312_80.cct
diff --git a/newlib/libc/iconv/ccs/binary/iso_8859_1.cct b/newlib/libc/iconv/ccs/binary/iso_8859_1.cct
index 266528456..513f043af 100644
--- a/newlib/libc/iconv/ccs/binary/iso_8859_1.cct
+++ b/newlib/libc/iconv/ccs/binary/iso_8859_1.cct
diff --git a/newlib/libc/iconv/ccs/binary/iso_8859_15.cct b/newlib/libc/iconv/ccs/binary/iso_8859_15.cct
index 2940843ea..1fa732ce6 100644
--- a/newlib/libc/iconv/ccs/binary/iso_8859_15.cct
+++ b/newlib/libc/iconv/ccs/binary/iso_8859_15.cct
diff --git a/newlib/libc/iconv/ccs/binary/iso_8859_2.cct b/newlib/libc/iconv/ccs/binary/iso_8859_2.cct
index bb54f34c2..cd449e9e1 100644
--- a/newlib/libc/iconv/ccs/binary/iso_8859_2.cct
+++ b/newlib/libc/iconv/ccs/binary/iso_8859_2.cct
diff --git a/newlib/libc/iconv/ccs/binary/iso_8859_4.cct b/newlib/libc/iconv/ccs/binary/iso_8859_4.cct
index 67beedd95..6b8a379cf 100644
--- a/newlib/libc/iconv/ccs/binary/iso_8859_4.cct
+++ b/newlib/libc/iconv/ccs/binary/iso_8859_4.cct
diff --git a/newlib/libc/iconv/ccs/binary/iso_8859_5.cct b/newlib/libc/iconv/ccs/binary/iso_8859_5.cct
index b3a04f085..187faaa3d 100644
--- a/newlib/libc/iconv/ccs/binary/iso_8859_5.cct
+++ b/newlib/libc/iconv/ccs/binary/iso_8859_5.cct
diff --git a/newlib/libc/iconv/ccs/binary/jis_x0201.cct b/newlib/libc/iconv/ccs/binary/jis_x0201.cct
index e2e2abc60..907804828 100644
--- a/newlib/libc/iconv/ccs/binary/jis_x0201.cct
+++ b/newlib/libc/iconv/ccs/binary/jis_x0201.cct
diff --git a/newlib/libc/iconv/ccs/binary/jis_x0208_1983.cct b/newlib/libc/iconv/ccs/binary/jis_x0208_1983.cct
index f16977312..fbdce4557 100644
--- a/newlib/libc/iconv/ccs/binary/jis_x0208_1983.cct
+++ b/newlib/libc/iconv/ccs/binary/jis_x0208_1983.cct
diff --git a/newlib/libc/iconv/ccs/binary/jis_x0212_1990.cct b/newlib/libc/iconv/ccs/binary/jis_x0212_1990.cct
index 563143db4..e5b389f16 100644
--- a/newlib/libc/iconv/ccs/binary/jis_x0212_1990.cct
+++ b/newlib/libc/iconv/ccs/binary/jis_x0212_1990.cct
diff --git a/newlib/libc/iconv/ccs/binary/koi8_r.cct b/newlib/libc/iconv/ccs/binary/koi8_r.cct
index 38194d500..82e79504f 100644
--- a/newlib/libc/iconv/ccs/binary/koi8_r.cct
+++ b/newlib/libc/iconv/ccs/binary/koi8_r.cct
diff --git a/newlib/libc/iconv/ccs/binary/koi8_u.cct b/newlib/libc/iconv/ccs/binary/koi8_u.cct
index 7d38fecda..1092efe74 100644
--- a/newlib/libc/iconv/ccs/binary/koi8_u.cct
+++ b/newlib/libc/iconv/ccs/binary/koi8_u.cct
diff --git a/newlib/libc/iconv/ccs/binary/ksx1001.cct b/newlib/libc/iconv/ccs/binary/ksx1001.cct
index cd9792519..afa656c32 100644
--- a/newlib/libc/iconv/ccs/binary/ksx1001.cct
+++ b/newlib/libc/iconv/ccs/binary/ksx1001.cct
diff --git a/newlib/libc/iconv/ccs/binary/shift_jis.cct b/newlib/libc/iconv/ccs/binary/shift_jis.cct
index de7aaafcb..87c105634 100644
--- a/newlib/libc/iconv/ccs/binary/shift_jis.cct
+++ b/newlib/libc/iconv/ccs/binary/shift_jis.cct
diff --git a/newlib/libc/iconv/ccs/binary/us_ascii.cct b/newlib/libc/iconv/ccs/binary/us_ascii.cct
index bce580334..d1bc24996 100644
--- a/newlib/libc/iconv/ccs/binary/us_ascii.cct
+++ b/newlib/libc/iconv/ccs/binary/us_ascii.cct
diff --git a/newlib/libc/iconv/ccs/cns11643_plane1.c b/newlib/libc/iconv/ccs/cns11643_plane1.c
index f1acdad5e..2f38104a0 100644
--- a/newlib/libc/iconv/ccs/cns11643_plane1.c
+++ b/newlib/libc/iconv/ccs/cns11643_plane1.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_CNS11643_PLANE1
+#ifdef _ICONV_CONVERTER_CNS11643_PLANE1
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_cns11643_plane1[] = {
+_CONST unsigned char _iconv_ccs_table_cns11643_plane1[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 14, 2,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0x43, 0x08),
 	_1l(0x00, 0x00, 0x00, 0x00), _1l(0x00, 0x00, 0x00, 0x00),
@@ -8489,6 +8488,5 @@ _CONST unsigned char iconv_ccs_table_cns11643_plane1[] = {
 	_2s(0xFF, 0xFE, 0xFF, 0xFE), _2s(0xFF, 0xFE, 0xFF, 0xFE),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_CNS11643_PLANE1 */
+#endif /* #ifdef _ICONV_CONVERTER_CNS11643_PLANE1 */
 
-#endif /* #ifdef ENABLE_ICONV */
diff --git a/newlib/libc/iconv/ccs/cns11643_plane14.c b/newlib/libc/iconv/ccs/cns11643_plane14.c
index 708dc48fb..37269f800 100644
--- a/newlib/libc/iconv/ccs/cns11643_plane14.c
+++ b/newlib/libc/iconv/ccs/cns11643_plane14.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_CNS11643_PLANE14
+#ifdef _ICONV_CONVERTER_CNS11643_PLANE14
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_cns11643_plane14[] = {
+_CONST unsigned char _iconv_ccs_table_cns11643_plane14[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 14, 2,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0x49, 0x08),
 	_1l(0x00, 0x00, 0x00, 0x00), _1l(0x00, 0x00, 0x00, 0x00),
@@ -7721,6 +7720,5 @@ _CONST unsigned char iconv_ccs_table_cns11643_plane14[] = {
 	_2s(0xFF, 0xFE, 0xFF, 0xFE), _2s(0xFF, 0xFE, 0xFF, 0xFE),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_CNS11643_PLANE14 */
+#endif /* #ifdef _ICONV_CONVERTER_CNS11643_PLANE14 */
 
-#endif /* #ifdef ENABLE_ICONV */
diff --git a/newlib/libc/iconv/ccs/cns11643_plane2.c b/newlib/libc/iconv/ccs/cns11643_plane2.c
index ea7d56adc..2baf5df41 100644
--- a/newlib/libc/iconv/ccs/cns11643_plane2.c
+++ b/newlib/libc/iconv/ccs/cns11643_plane2.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_CNS11643_PLANE2
+#ifdef _ICONV_CONVERTER_CNS11643_PLANE2
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_cns11643_plane2[] = {
+_CONST unsigned char _iconv_ccs_table_cns11643_plane2[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 14, 2,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0x54, 0x08),
 	_1l(0x00, 0x00, 0x00, 0x00), _1l(0x00, 0x00, 0x00, 0x00),
@@ -8073,6 +8072,5 @@ _CONST unsigned char iconv_ccs_table_cns11643_plane2[] = {
 	_2s(0xFF, 0xFE, 0xFF, 0xFE), _2s(0xFF, 0xFE, 0xFF, 0xFE),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_CNS11643_PLANE2 */
+#endif /* #ifdef _ICONV_CONVERTER_CNS11643_PLANE2 */
 
-#endif /* #ifdef ENABLE_ICONV */
diff --git a/newlib/libc/iconv/ccs/cp775.c b/newlib/libc/iconv/ccs/cp775.c
index 764c2478a..624aea2e8 100644
--- a/newlib/libc/iconv/ccs/cp775.c
+++ b/newlib/libc/iconv/ccs/cp775.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_CP775
+#ifdef _ICONV_CONVERTER_CP775
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_cp775[] = {
+_CONST unsigned char _iconv_ccs_table_cp775[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 8, 1,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0x02, 0x08),
 	_2s(0x00, 0x00, 0x00, 0x01), _2s(0x00, 0x02, 0x00, 0x03),
@@ -521,6 +520,5 @@ _CONST unsigned char iconv_ccs_table_cp775[] = {
 	_2s(0xFF, 0xFE, 0xFF, 0xFE), _2s(0xFF, 0xFE, 0xFF, 0xFE),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_CP775 */
+#endif /* #ifdef _ICONV_CONVERTER_CP775 */
 
-#endif /* #ifdef ENABLE_ICONV */
diff --git a/newlib/libc/iconv/ccs/cp850.c b/newlib/libc/iconv/ccs/cp850.c
index 9b5434338..a617b19b5 100644
--- a/newlib/libc/iconv/ccs/cp850.c
+++ b/newlib/libc/iconv/ccs/cp850.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_CP850
+#ifdef _ICONV_CONVERTER_CP850
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_cp850[] = {
+_CONST unsigned char _iconv_ccs_table_cp850[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 8, 1,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0x02, 0x08),
 	_2s(0x00, 0x00, 0x00, 0x01), _2s(0x00, 0x02, 0x00, 0x03),
@@ -457,6 +456,5 @@ _CONST unsigned char iconv_ccs_table_cp850[] = {
 	_2s(0xFF, 0xFE, 0xFF, 0xFE), _2s(0xFF, 0xFE, 0xFF, 0xFE),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_CP850 */
+#endif /* #ifdef _ICONV_CONVERTER_CP850 */
 
-#endif /* #ifdef ENABLE_ICONV */
diff --git a/newlib/libc/iconv/ccs/cp852.c b/newlib/libc/iconv/ccs/cp852.c
index a6e19e748..9b1471db1 100644
--- a/newlib/libc/iconv/ccs/cp852.c
+++ b/newlib/libc/iconv/ccs/cp852.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_CP852
+#ifdef _ICONV_CONVERTER_CP852
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_cp852[] = {
+_CONST unsigned char _iconv_ccs_table_cp852[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 8, 1,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0x02, 0x08),
 	_2s(0x00, 0x00, 0x00, 0x01), _2s(0x00, 0x02, 0x00, 0x03),
@@ -457,6 +456,5 @@ _CONST unsigned char iconv_ccs_table_cp852[] = {
 	_2s(0xFF, 0xFE, 0xFF, 0xFE), _2s(0xFF, 0xFE, 0xFF, 0xFE),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_CP852 */
+#endif /* #ifdef _ICONV_CONVERTER_CP852 */
 
-#endif /* #ifdef ENABLE_ICONV */
diff --git a/newlib/libc/iconv/ccs/cp855.c b/newlib/libc/iconv/ccs/cp855.c
index 90af33b14..52ebf487a 100644
--- a/newlib/libc/iconv/ccs/cp855.c
+++ b/newlib/libc/iconv/ccs/cp855.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_CP855
+#ifdef _ICONV_CONVERTER_CP855
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_cp855[] = {
+_CONST unsigned char _iconv_ccs_table_cp855[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 8, 1,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0x02, 0x08),
 	_2s(0x00, 0x00, 0x00, 0x01), _2s(0x00, 0x02, 0x00, 0x03),
@@ -457,6 +456,5 @@ _CONST unsigned char iconv_ccs_table_cp855[] = {
 	_2s(0xFF, 0xFE, 0xFF, 0xFE), _2s(0xFF, 0xFE, 0xFF, 0xFE),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_CP855 */
+#endif /* #ifdef _ICONV_CONVERTER_CP855 */
 
-#endif /* #ifdef ENABLE_ICONV */
diff --git a/newlib/libc/iconv/ccs/cp866.c b/newlib/libc/iconv/ccs/cp866.c
index dd6c93194..84b4e0d72 100644
--- a/newlib/libc/iconv/ccs/cp866.c
+++ b/newlib/libc/iconv/ccs/cp866.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_CP866
+#ifdef _ICONV_CONVERTER_CP866
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_cp866[] = {
+_CONST unsigned char _iconv_ccs_table_cp866[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 8, 1,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0x02, 0x08),
 	_2s(0x00, 0x00, 0x00, 0x01), _2s(0x00, 0x02, 0x00, 0x03),
@@ -521,6 +520,5 @@ _CONST unsigned char iconv_ccs_table_cp866[] = {
 	_2s(0xFF, 0xFE, 0xFF, 0xFE), _2s(0xFF, 0xFE, 0xFF, 0xFE),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_CP866 */
+#endif /* #ifdef _ICONV_CONVERTER_CP866 */
 
-#endif /* #ifdef ENABLE_ICONV */
diff --git a/newlib/libc/iconv/ccs/gb_2312_80.c b/newlib/libc/iconv/ccs/gb_2312_80.c
index 04bfd6889..7f846cb12 100644
--- a/newlib/libc/iconv/ccs/gb_2312_80.c
+++ b/newlib/libc/iconv/ccs/gb_2312_80.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_GB_2312_80
+#ifdef _ICONV_CONVERTER_GB_2312_80
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_gb_2312_80[] = {
+_CONST unsigned char _iconv_ccs_table_gb_2312_80[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 14, 2,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0x53, 0x08),
 	_1l(0x00, 0x00, 0x00, 0x00), _1l(0x00, 0x00, 0x00, 0x00),
@@ -9001,6 +9000,5 @@ _CONST unsigned char iconv_ccs_table_gb_2312_80[] = {
 	_2s(0xFF, 0xFE, 0xFF, 0xFE), _2s(0xFF, 0xFE, 0xFF, 0xFE),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_GB_2312_80 */
+#endif /* #ifdef _ICONV_CONVERTER_GB_2312_80 */
 
-#endif /* #ifdef ENABLE_ICONV */
diff --git a/newlib/libc/iconv/ccs/iconv_mktbl b/newlib/libc/iconv/ccs/iconv_mktbl
index 6ecffc6ef..6c628227a 100644
--- a/newlib/libc/iconv/ccs/iconv_mktbl
+++ b/newlib/libc/iconv/ccs/iconv_mktbl
@@ -251,19 +251,19 @@ if ($opt_C) {
     $opt_o =~ tr/-/_/;
     $name = $opt_o;
         $name =~ tr/[a-z]/[A-Z]/;
-    print qq/#ifdef ENABLE_ICONV\n/;
-    print qq/#include "..\/lib\/deps.h"\n\n/;
-    print "#ifdef ICONV_CONVERTER_$name\n";
-    print qq/#include "..\/lib\/endian.h"\n\n/;
-    print "_CONST unsigned char iconv_ccs_table_$opt_o" . "[] = {\n";
+    print "#include \"..\/lib\/deps.h\"\n\n";
+    print "#ifdef _ICONV_CONVERTER_$name\n";
+    print "#include \"..\/lib\/endian.h\"\n\n";
+    print "_CONST unsigned char _iconv_ccs_table_$opt_o" . "[] = {\n";
     print "\t3, 'C', 'S', 'C', 'T', ICONV_ORDER, $nbits, $type,\n";
     print &pack_array(2, 'N', [8, 8 + $to_size]);
+    print $to;
+    print $from;
+    print "};\n\n";
+    print "#endif /* #ifdef _ICONV_CONVERTER_$name */\n\n";
 } else {
     print pack("A5CCCNN", "\003CSCT", 0, $nbits, $type, 8, 8 + $to_size);
+    print $to;
+    print $from;
 }
-print $to;
-print $from;
-print "};\n\n";
-print "#endif /* #ifdef ICONV_CONVERTER_$name */\n\n";
-print "#endif /* #ifdef ENABLE_ICONV */\n" if $opt_C;
 
diff --git a/newlib/libc/iconv/ccs/iso_8859_1.c b/newlib/libc/iconv/ccs/iso_8859_1.c
index 3b78dd4b7..eb07eadc0 100644
--- a/newlib/libc/iconv/ccs/iso_8859_1.c
+++ b/newlib/libc/iconv/ccs/iso_8859_1.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_ISO_8859_1
+#ifdef _ICONV_CONVERTER_ISO_8859_1
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_iso_8859_1[] = {
+_CONST unsigned char _iconv_ccs_table_iso_8859_1[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 8, 1,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0x02, 0x08),
 	_2s(0x00, 0x00, 0x00, 0x01), _2s(0x00, 0x02, 0x00, 0x03),
@@ -265,6 +264,5 @@ _CONST unsigned char iconv_ccs_table_iso_8859_1[] = {
 	_2s(0x00, 0xFC, 0x00, 0xFD), _2s(0x00, 0xFE, 0x00, 0xFF),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_ISO_8859_1 */
+#endif /* #ifdef _ICONV_CONVERTER_ISO_8859_1 */
 
-#endif /* #ifdef ENABLE_ICONV */
diff --git a/newlib/libc/iconv/ccs/iso_8859_15.c b/newlib/libc/iconv/ccs/iso_8859_15.c
index f4f22147c..ef3babc8a 100644
--- a/newlib/libc/iconv/ccs/iso_8859_15.c
+++ b/newlib/libc/iconv/ccs/iso_8859_15.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_ISO_8859_15
+#ifdef _ICONV_CONVERTER_ISO_8859_15
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_iso_8859_15[] = {
+_CONST unsigned char _iconv_ccs_table_iso_8859_15[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 8, 1,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0x02, 0x08),
 	_2s(0x00, 0x00, 0x00, 0x01), _2s(0x00, 0x02, 0x00, 0x03),
@@ -393,6 +392,5 @@ _CONST unsigned char iconv_ccs_table_iso_8859_15[] = {
 	_2s(0xFF, 0xFE, 0xFF, 0xFE), _2s(0xFF, 0xFE, 0xFF, 0xFE),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_ISO_8859_15 */
+#endif /* #ifdef _ICONV_CONVERTER_ISO_8859_15 */
 
-#endif /* #ifdef ENABLE_ICONV */
diff --git a/newlib/libc/iconv/ccs/iso_8859_2.c b/newlib/libc/iconv/ccs/iso_8859_2.c
index 8f191075d..1a617e881 100644
--- a/newlib/libc/iconv/ccs/iso_8859_2.c
+++ b/newlib/libc/iconv/ccs/iso_8859_2.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_ISO_8859_2
+#ifdef _ICONV_CONVERTER_ISO_8859_2
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_iso_8859_2[] = {
+_CONST unsigned char _iconv_ccs_table_iso_8859_2[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 8, 1,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0x02, 0x08),
 	_2s(0x00, 0x00, 0x00, 0x01), _2s(0x00, 0x02, 0x00, 0x03),
@@ -393,6 +392,5 @@ _CONST unsigned char iconv_ccs_table_iso_8859_2[] = {
 	_2s(0xFF, 0xFE, 0xFF, 0xFE), _2s(0xFF, 0xFE, 0xFF, 0xFE),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_ISO_8859_2 */
+#endif /* #ifdef _ICONV_CONVERTER_ISO_8859_2 */
 
-#endif /* #ifdef ENABLE_ICONV */
diff --git a/newlib/libc/iconv/ccs/iso_8859_4.c b/newlib/libc/iconv/ccs/iso_8859_4.c
index 04fab2122..2b56dd235 100644
--- a/newlib/libc/iconv/ccs/iso_8859_4.c
+++ b/newlib/libc/iconv/ccs/iso_8859_4.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_ISO_8859_4
+#ifdef _ICONV_CONVERTER_ISO_8859_4
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_iso_8859_4[] = {
+_CONST unsigned char _iconv_ccs_table_iso_8859_4[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 8, 1,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0x02, 0x08),
 	_2s(0x00, 0x00, 0x00, 0x01), _2s(0x00, 0x02, 0x00, 0x03),
@@ -393,6 +392,5 @@ _CONST unsigned char iconv_ccs_table_iso_8859_4[] = {
 	_2s(0xFF, 0xFE, 0xFF, 0xFE), _2s(0xFF, 0xFE, 0xFF, 0xFE),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_ISO_8859_4 */
+#endif /* #ifdef _ICONV_CONVERTER_ISO_8859_4 */
 
-#endif /* #ifdef ENABLE_ICONV */
diff --git a/newlib/libc/iconv/ccs/iso_8859_5.c b/newlib/libc/iconv/ccs/iso_8859_5.c
index cfc732d77..38ea5bd03 100644
--- a/newlib/libc/iconv/ccs/iso_8859_5.c
+++ b/newlib/libc/iconv/ccs/iso_8859_5.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_ISO_8859_5
+#ifdef _ICONV_CONVERTER_ISO_8859_5
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_iso_8859_5[] = {
+_CONST unsigned char _iconv_ccs_table_iso_8859_5[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 8, 1,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0x02, 0x08),
 	_2s(0x00, 0x00, 0x00, 0x01), _2s(0x00, 0x02, 0x00, 0x03),
@@ -393,6 +392,5 @@ _CONST unsigned char iconv_ccs_table_iso_8859_5[] = {
 	_2s(0xFF, 0xFE, 0xFF, 0xFE), _2s(0xFF, 0xFE, 0xFF, 0xFE),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_ISO_8859_5 */
+#endif /* #ifdef _ICONV_CONVERTER_ISO_8859_5 */
 
-#endif /* #ifdef ENABLE_ICONV */
diff --git a/newlib/libc/iconv/ccs/jis_x0201.c b/newlib/libc/iconv/ccs/jis_x0201.c
index f2843479d..21a638ac2 100644
--- a/newlib/libc/iconv/ccs/jis_x0201.c
+++ b/newlib/libc/iconv/ccs/jis_x0201.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_JIS_X0201
+#ifdef _ICONV_CONVERTER_JIS_X0201
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_jis_x0201[] = {
+_CONST unsigned char _iconv_ccs_table_jis_x0201[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 8, 1,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0x02, 0x08),
 	_2s(0x00, 0x00, 0x00, 0x01), _2s(0x00, 0x02, 0x00, 0x03),
@@ -393,6 +392,5 @@ _CONST unsigned char iconv_ccs_table_jis_x0201[] = {
 	_2s(0xFF, 0xFE, 0xFF, 0xFE), _2s(0xFF, 0xFE, 0xFF, 0xFE),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_JIS_X0201 */
+#endif /* #ifdef _ICONV_CONVERTER_JIS_X0201 */
 
-#endif /* #ifdef ENABLE_ICONV */
diff --git a/newlib/libc/iconv/ccs/jis_x0208_1983.c b/newlib/libc/iconv/ccs/jis_x0208_1983.c
index 306359e8a..9f638ec07 100644
--- a/newlib/libc/iconv/ccs/jis_x0208_1983.c
+++ b/newlib/libc/iconv/ccs/jis_x0208_1983.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_JIS_X0208_1983
+#ifdef _ICONV_CONVERTER_JIS_X0208_1983
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_jis_x0208_1983[] = {
+_CONST unsigned char _iconv_ccs_table_jis_x0208_1983[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 14, 2,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0x4F, 0x08),
 	_1l(0x00, 0x00, 0x00, 0x00), _1l(0x00, 0x00, 0x00, 0x00),
@@ -8617,6 +8616,5 @@ _CONST unsigned char iconv_ccs_table_jis_x0208_1983[] = {
 	_2s(0xFF, 0xFE, 0xFF, 0xFE), _2s(0xFF, 0xFE, 0xFF, 0xFE),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_JIS_X0208_1983 */
+#endif /* #ifdef _ICONV_CONVERTER_JIS_X0208_1983 */
 
-#endif /* #ifdef ENABLE_ICONV */
diff --git a/newlib/libc/iconv/ccs/jis_x0212_1990.c b/newlib/libc/iconv/ccs/jis_x0212_1990.c
index d01bba692..c3a5614f0 100644
--- a/newlib/libc/iconv/ccs/jis_x0212_1990.c
+++ b/newlib/libc/iconv/ccs/jis_x0212_1990.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_JIS_X0212_1990
+#ifdef _ICONV_CONVERTER_JIS_X0212_1990
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_jis_x0212_1990[] = {
+_CONST unsigned char _iconv_ccs_table_jis_x0212_1990[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 14, 2,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0x46, 0x08),
 	_1l(0x00, 0x00, 0x00, 0x00), _1l(0x00, 0x00, 0x00, 0x00),
@@ -8009,6 +8008,5 @@ _CONST unsigned char iconv_ccs_table_jis_x0212_1990[] = {
 	_2s(0xFF, 0xFE, 0xFF, 0xFE), _2s(0xFF, 0xFE, 0xFF, 0xFE),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_JIS_X0212_1990 */
+#endif /* #ifdef _ICONV_CONVERTER_JIS_X0212_1990 */
 
-#endif /* #ifdef ENABLE_ICONV */
diff --git a/newlib/libc/iconv/ccs/koi8_r.c b/newlib/libc/iconv/ccs/koi8_r.c
index 66c5f945f..ba0340d74 100644
--- a/newlib/libc/iconv/ccs/koi8_r.c
+++ b/newlib/libc/iconv/ccs/koi8_r.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_KOI8_R
+#ifdef _ICONV_CONVERTER_KOI8_R
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_koi8_r[] = {
+_CONST unsigned char _iconv_ccs_table_koi8_r[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 8, 1,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0x02, 0x08),
 	_2s(0x00, 0x00, 0x00, 0x01), _2s(0x00, 0x02, 0x00, 0x03),
@@ -521,6 +520,5 @@ _CONST unsigned char iconv_ccs_table_koi8_r[] = {
 	_2s(0xFF, 0xFE, 0xFF, 0xFE), _2s(0xFF, 0xFE, 0xFF, 0xFE),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_KOI8_R */
+#endif /* #ifdef _ICONV_CONVERTER_KOI8_R */
 
-#endif /* #ifdef ENABLE_ICONV */
diff --git a/newlib/libc/iconv/ccs/koi8_u.c b/newlib/libc/iconv/ccs/koi8_u.c
index 8fe8a2ddf..c82d1288e 100644
--- a/newlib/libc/iconv/ccs/koi8_u.c
+++ b/newlib/libc/iconv/ccs/koi8_u.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_KOI8_U
+#ifdef _ICONV_CONVERTER_KOI8_U
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_koi8_u[] = {
+_CONST unsigned char _iconv_ccs_table_koi8_u[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 8, 1,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0x02, 0x08),
 	_2s(0x00, 0x00, 0x00, 0x01), _2s(0x00, 0x02, 0x00, 0x03),
@@ -521,6 +520,5 @@ _CONST unsigned char iconv_ccs_table_koi8_u[] = {
 	_2s(0xFF, 0xFE, 0xFF, 0xFE), _2s(0xFF, 0xFE, 0xFF, 0xFE),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_KOI8_U */
+#endif /* #ifdef _ICONV_CONVERTER_KOI8_U */
 
-#endif /* #ifdef ENABLE_ICONV */
diff --git a/newlib/libc/iconv/ccs/ksx1001.c b/newlib/libc/iconv/ccs/ksx1001.c
index a95ca91ab..4f325d7cd 100644
--- a/newlib/libc/iconv/ccs/ksx1001.c
+++ b/newlib/libc/iconv/ccs/ksx1001.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_KSX1001
+#ifdef _ICONV_CONVERTER_KSX1001
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_ksx1001[] = {
+_CONST unsigned char _iconv_ccs_table_ksx1001[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 14, 2,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0x5B, 0x08),
 	_1l(0x00, 0x00, 0x00, 0x00), _1l(0x00, 0x00, 0x00, 0x00),
@@ -12329,6 +12328,5 @@ _CONST unsigned char iconv_ccs_table_ksx1001[] = {
 	_2s(0xFF, 0xFE, 0xFF, 0xFE), _2s(0xFF, 0xFE, 0xFF, 0xFE),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_KSX1001 */
+#endif /* #ifdef _ICONV_CONVERTER_KSX1001 */
 
-#endif /* #ifdef ENABLE_ICONV */
diff --git a/newlib/libc/iconv/ccs/shift_jis.c b/newlib/libc/iconv/ccs/shift_jis.c
index 9d87b5f70..e8dcb6075 100644
--- a/newlib/libc/iconv/ccs/shift_jis.c
+++ b/newlib/libc/iconv/ccs/shift_jis.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_SHIFT_JIS
+#ifdef _ICONV_CONVERTER_SHIFT_JIS
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_shift_jis[] = {
+_CONST unsigned char _iconv_ccs_table_shift_jis[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 16, 3,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0x54, 0x08),
 	_1l(0x00, 0x00, 0x04, 0x00), _1l(0x00, 0x00, 0x00, 0x00),
@@ -8777,6 +8776,5 @@ _CONST unsigned char iconv_ccs_table_shift_jis[] = {
 	_2s(0xFF, 0xFE, 0xFF, 0xFE), _2s(0xFF, 0xFE, 0xFF, 0xFE),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_SHIFT_JIS */
+#endif /* #ifdef _ICONV_CONVERTER_SHIFT_JIS */
 
-#endif /* #ifdef ENABLE_ICONV */
diff --git a/newlib/libc/iconv/ccs/us_ascii.c b/newlib/libc/iconv/ccs/us_ascii.c
index 8622f7886..d89f05086 100644
--- a/newlib/libc/iconv/ccs/us_ascii.c
+++ b/newlib/libc/iconv/ccs/us_ascii.c
@@ -1,10 +1,9 @@
-#ifdef ENABLE_ICONV
 #include "../lib/deps.h"
 
-#ifdef ICONV_CONVERTER_US_ASCII
+#ifdef _ICONV_CONVERTER_US_ASCII
 #include "../lib/endian.h"
 
-_CONST unsigned char iconv_ccs_table_us_ascii[] = {
+_CONST unsigned char _iconv_ccs_table_us_ascii[] = {
 	3, 'C', 'S', 'C', 'T', ICONV_ORDER, 7, 0,
 	_1l(0x00, 0x00, 0x00, 0x08), _1l(0x00, 0x00, 0x01, 0x08),
 	_2s(0x00, 0x00, 0x00, 0x01), _2s(0x00, 0x02, 0x00, 0x03),
@@ -233,6 +232,5 @@ _CONST unsigned char iconv_ccs_table_us_ascii[] = {
 	_2s(0xFF, 0xFE, 0xFF, 0xFE), _2s(0xFF, 0xFE, 0xFF, 0xFE),
 };
 
-#endif /* #ifdef ICONV_CONVERTER_US_ASCII */
+#endif /* #ifdef _ICONV_CONVERTER_US_ASCII */
 
-#endif /* #ifdef ENABLE_ICONV */