diff options
| author | dmalcolm <dmalcolm@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-08-08 20:46:19 +0000 |
|---|---|---|
| committer | dmalcolm <dmalcolm@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-08-08 20:46:19 +0000 |
| commit | e2f73ee87c3aa22f2fe67e29e20b92264f879344 (patch) | |
| tree | 0d06d12ab1fdf231b1891912859d34cca893d895 | |
| parent | 242eae8e39b0bb78b4274e04ad8f71ff43fd1d53 (diff) | |
| download | gcc-e2f73ee87c3aa22f2fe67e29e20b92264f879344.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239257 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/input.c | 4 |
2 files changed, 9 insertions, 0 deletions
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 |