Merge branch 'ng/4.8/master' into ng/4.8/mingw-libintl-revert
diff --git a/gcc/config.in b/gcc/config.in
index d80fb9f..0b07f3e 100644
--- a/gcc/config.in
+++ b/gcc/config.in
@@ -1278,12 +1278,6 @@
 #endif
 
 
-/* Define to 1 if you have the <libintl.h> header file. */
-#ifndef USED_FOR_TARGET
-#undef HAVE_LIBINTL_H
-#endif
-
-
 /* Define to 1 if you have the <limits.h> header file. */
 #ifndef USED_FOR_TARGET
 #undef HAVE_LIMITS_H
diff --git a/gcc/configure b/gcc/configure
index e12a180..feb9a5e 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -8290,7 +8290,7 @@
 for ac_header in limits.h stddef.h string.h strings.h stdlib.h time.h iconv.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 libintl.h
+		 direct.h malloc.h langinfo.h ldfcn.h locale.h wchar.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_preproc "$LINENO" "$ac_header" "$as_ac_Header"
diff --git a/gcc/configure.ac b/gcc/configure.ac
index eba3577..35a42d1 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -942,7 +942,7 @@
 AC_CHECK_HEADERS(limits.h stddef.h string.h strings.h stdlib.h time.h iconv.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 libintl.h)
+		 direct.h malloc.h langinfo.h ldfcn.h locale.h wchar.h)
 
 # Check for thread headers.
 AC_CHECK_HEADER(thread.h, [have_thread_h=yes], [have_thread_h=])
diff --git a/gcc/intl.h b/gcc/intl.h
index 5ea5f5b..e1c6c2b 100644
--- a/gcc/intl.h
+++ b/gcc/intl.h
@@ -26,16 +26,8 @@
 # define setlocale(category, locale) (locale)
 #endif
 
-/* If libintl.h is available, include it before testing for NLS. If we
-   are building with --disable-nls and another header file includes
-   libintl.h, the stubs defined down below will cause syntax errors
-   when parsing libintl.h. See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54281
-   for details.  */
-#if defined(HAVE_LIBINTL_H) || defined(ENABLE_NLS)
-# include <libintl.h>
-#endif
-
 #ifdef ENABLE_NLS
+#include <libintl.h>
 extern void gcc_init_libintl (void);
 extern size_t gcc_gettext_width (const char *);
 #else