diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b7d482308e07d7301f21b93da16b70f4c1ff42ae..ac441c0dbc24482df6368f320f654890c86efeaa 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-07  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	* cppcharset.c (ICONV_CONST): Define iff !HAVE_ICONV.
+	(convert_cset): Change inbuf to type ICONV_CONST char.
+	* Makefile.in (LIBS): Add LIBICONV.
+
 2003-07-06  Art Haas  <ahaas@airmail.net>
 
 	* f/global.c (ffeglobal_type_string_): Fix obsolete GCC array
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 5ebb42bd1a06b7fc6d1f5e9da997d8d7798dfc71..3825d8ae7bc54816f6b59f932131676cb31c1cb6 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -691,7 +691,7 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY)
 
 # How to link with both our special library facilities
 # and the system's installed libraries.
-LIBS =	$(INTLLIBS) @LIBS@ $(LIBIBERTY)
+LIBS =	$(INTLLIBS) @LIBS@ $(LIBIBERTY) $(LIBICONV)
 
 # Any system libraries needed just for GNAT.
 SYSLIBS = @GNAT_LIBEXC@
diff --git a/gcc/cppcharset.c b/gcc/cppcharset.c
index 84187b9810e93b1a554f245c1cda4cf637d9bdd6..0e9805fd4d5d3410556fe5c454f7752ec2d0df5b 100644
--- a/gcc/cppcharset.c
+++ b/gcc/cppcharset.c
@@ -81,6 +81,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define iconv_open(x, y) (errno = EINVAL, (iconv_t)-1)
 #define iconv(a,b,c,d,e) (errno = EINVAL, (size_t)-1)
 #define iconv_close(x)   0
+#define ICONV_CONST
 #endif
 
 #if HOST_CHARSET == HOST_CHARSET_ASCII
@@ -210,14 +211,15 @@ convert_cset (iconv_t cd, const uchar *from, size_t flen, struct strbuf *to)
     }
   else
     {
-      char *inbuf, *outbuf;
+      ICONV_CONST char *inbuf;
+      char *outbuf;
       size_t inbytesleft, outbytesleft;
 
       /* Reset conversion descriptor and check that it is valid.  */
       if (iconv (cd, 0, 0, 0, 0) == (size_t)-1)
 	return false;
 
-      inbuf = (char *)from;
+      inbuf = (ICONV_CONST char *)from;
       inbytesleft = flen;
       outbuf = (char *)to->text + to->len;
       outbytesleft = to->asize - to->len;