[PATCH][BUGFIX][gcj 4.1,4.2][PR 31932] gcj: Remove useless HAVE_ICONV_H [1/2]

[PATCH][BUGFIX][gcj 4.1,4.2][PR 31932] gcj: Remove useless HAVE_ICONV_H [1/2]

[Sergiy Vyshnevetskiy]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 978 bytes --]

Parts of gcj up to and including 4.2 branch are compiled without libiconv 
when it's present in the system in a non-default location and 
--with-libiconv-prefix specified correctly.

The reason for this is usage of HAVE_ICONV_H macro in gcc/java/lex.h

1. The check for iconv.h in gcc/configure does not use the value of
--with-libiconv-prefix option.

2. HAVE_ICONV_H is useless because check for libiconv in gcc/configure 
uses iconv.h anyway.

3. HAVE_ICONV is changed in gcc/java/lex.h like this:

#ifndef HAVE_ICONV_H
#undef HAVE_ICONV
#endif

which is inherently incorrect in and of itself: any information produced 
by configure must not be changed in the source code. If configure tests 
don't work right - fix them, but all source code must be compiled with the 
same global settings.

Solution: get rid of HAVE_ICONV_H in gcc/java/lex.h.



2007-05-18  Sergiy Vyshnevetskiy  <serg@vostok.net>

 	PR propocessor/31932
 	* lex.h: Remove unnecessary usage of HAVE_ICONV_H

[-- Attachment #2: Type: TEXT/PLAIN, Size: 339 bytes --]

--- gcc/java/lex.h.orig	Sat Jun 25 03:33:05 2005
+++ gcc/java/lex.h	Sat May 12 21:44:38 2007
@@ -35,10 +35,6 @@
 /* A Unicode character, as read from the input file  */
 typedef unsigned short unicode_t;
 
-#ifndef HAVE_ICONV_H
-#undef HAVE_ICONV
-#endif
-
 #if defined HAVE_ICONV
 #include <iconv.h>
 #endif /* HAVE_ICONV */

[PATCH][BUGFIX][gcj 4.1,4.2][PR 31932] gcj: Remove useless HAVE_ICONV_H [2/2]

[Sergiy Vyshnevetskiy]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 266 bytes --]

After applying previous part HAVE_ICONV_H is no longer used in gcc/*. We 
can safely remove the check from gcc/configure.ac

2007-05-18  Sergiy Vyshnevetskiy  <serg@vostok.net>

 	* configure.ac: Remove useless check for iconv.h existence.
 	* configure: Regenerate

[-- Attachment #2: Type: TEXT/PLAIN, Size: 508 bytes --]

--- gcc/configure.ac.orig	Tue Nov 14 00:09:55 2006
+++ gcc/configure.ac	Sat May 12 21:11:38 2007
@@ -910,7 +910,7 @@
 AC_HEADER_TIME
 ACX_HEADER_STRING
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(limits.h stddef.h string.h strings.h stdlib.h time.h iconv.h \
+AC_CHECK_HEADERS(limits.h stddef.h string.h strings.h stdlib.h time.h \
 		 fcntl.h unistd.h sys/file.h sys/time.h sys/mman.h \
 		 sys/resource.h sys/param.h sys/times.h sys/stat.h \
 		 direct.h malloc.h langinfo.h ldfcn.h locale.h wchar.h)

[PATCH][BUGFIX][PR 31932] cpp: Remove useless HAVE_ICONV_H [2/2]

[Sergiy Vyshnevetskiy]

After applying previous part HAVE_ICONV_H is no longer used in libcpp/*. 
We can safely remove the check from libcpp/configure.ac

2007-05-18  Sergiy Vyshnevetskiy  <serg@vostok.net>

 	 * configure.ac: Remove useless check for iconv.h existence.
 	 * configure: Regenerate

[PATCH][BUGFIX][PR 31932] cpp: Remove useless HAVE_ICONV_H [1/2]

[Sergiy Vyshnevetskiy]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 972 bytes --]

Parts of cpp are compiled without libiconv when it's present in the system 
in a non-default location and --with-libiconv-prefix specified correctly.

The reason for this is usage of HAVE_ICONV_H macro in libcpp/internal.h

1. The check for iconv.h in libcpp/configure does not use the value of
--with-libiconv-prefix option.

2. HAVE_ICONV_H is useless because check for libiconv in libcpp/configure
    uses iconv.h anyway.

3. HAVE_ICONV is changed in libcpp/internal.h like this:

#ifndef HAVE_ICONV_H
#undef HAVE_ICONV
#endif

which is inherently incorrect in and of itself: any information produced by 
configure must not be changed in the source code. If configure tests don't 
work right - fix them, but all source code must be compiled with the same 
global settings.

Solution: get rid of HAVE_ICONV_H in libcpp/internal.h.



2007-05-18  Sergiy Vyshnevetskiy  <serg@vostok.net>

 	 PR propocessor/31932
 	 * internal.h: Remove unnecessary usage of HAVE_ICONV_H

[-- Attachment #2: Type: TEXT/PLAIN, Size: 274 bytes --]

--- libcpp/internal.h.orig	Fri Oct 21 20:54:20 2005
+++ libcpp/internal.h	Sat May 12 21:47:11 2007
@@ -26,10 +26,6 @@
 #include "symtab.h"
 #include "cpp-id-data.h"
 
-#ifndef HAVE_ICONV_H
-#undef HAVE_ICONV
-#endif
-
 #if HAVE_ICONV
 #include <iconv.h>
 #else