From: David Malcolm <dmalcolm@redhat.com>
Date: Mon, 8 Aug 2016 20:46:19 +0000 (+0000)
Subject: Fix selftest::test_lexer_string_locations_ebcdic for systems without iconv (PR bootst... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a7d79e5cbb77e0ee53d81db5a94ac865cbefd5bf;p=gcc.git

Fix selftest::test_lexer_string_locations_ebcdic for systems without iconv (PR bootstrap/72844)

selftest::test_lexer_string_locations_ebcdic has this clause:

  /* EBCDIC support requires iconv.  */
  if (!HAVE_ICONV)
    return;

leading to a build failure on systems without iconv.  This conditional
works in libcpp due to this in libcpp/internal.h:

  #if HAVE_ICONV
  #include <iconv.h>
  #else
  #define HAVE_ICONV 0
  typedef int iconv_t;  /* dummy */
  #endif

Fix the problem by ensuring that HAVE_ICONV is always defined within
gcc/input.c.

gcc/ChangeLog:
	PR bootstrap/72844
	* input.c: Ensure that HAVE_ICONV is defined.

From-SVN: r239257
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3cf7074def5..34cf61e7d6d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-08-08  David Malcolm  <dmalcolm@redhat.com>
+
+	PR bootstrap/72844
+	* input.c: Ensure that HAVE_ICONV is defined.
+
 2016-08-08  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/72781
diff --git a/gcc/input.c b/gcc/input.c
index d058b8aa81f..790de936bac 100644
--- a/gcc/input.c
+++ b/gcc/input.c
@@ -25,6 +25,10 @@ along with GCC; see the file COPYING3.  If not see
 #include "selftest.h"
 #include "cpplib.h"
 
+#ifndef HAVE_ICONV
+#define HAVE_ICONV 0
+#endif
+
 /* This is a cache used by get_next_line to store the content of a
    file to be searched for file lines.  */
 struct fcache