OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR bootstrap/54659 (Bootstrap with --disable-nls broken under Windows) 

PR bootstrap/54659

	Revert:

	2012-08-17  Diego Novillo  <dnovillo@google.com>

		PR bootstrap/54281
		* configure.ac: Add libintl.h to AC_CHECK_HEADERS list.
		* config.in: Regenerate.
		* configure: Regenerate.
		* intl.h: Always include libintl.h if HAVE_LIBINTL_H is
		set.

From-SVN: r198711
This commit is contained in:
Diego Novillo 2013-05-08 09:22:14 -04:00 committed by Diego Novillo
parent 702d870328
commit 4fbfcf44ba
5 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gcc/ChangeLog
View File

@ -1,3 +1,18 @@
2013-05-08 Diego Novillo <dnovillo@google.com>
PR bootstrap/54659
Revert:
2012-08-17 Diego Novillo <dnovillo@google.com>
PR bootstrap/54281
* configure.ac: Add libintl.h to AC_CHECK_HEADERS list.
* config.in: Regenerate.
* configure: Regenerate.
* intl.h: Always include libintl.h if HAVE_LIBINTL_H is
set.
2013-05-08 Jan Hubicka <jh@suse.cz>
PR lto/54095

6
gcc/config.in
View File

@ -1297,12 +1297,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

2
gcc/configure vendored
View File

@ -8292,7 +8292,7 @@ fi
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"

2
gcc/configure.ac
View File

@ -942,7 +942,7 @@ AC_HEADER_SYS_WAIT
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=])

10
gcc/intl.h
View File

@ -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