Revert "2012-08-17 Diego Novillo <[email protected]>"
This reverts commit 4b9beb88f5d49452a1fb25826c00cd81b7461b04.
Conflicts:
gcc/ChangeLog
gcc/configure
Change-Id: I6f7252ea648d71415b4a5b7d43f001c7d3f39c9c
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 004af13..9ea6ad2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -60,7 +60,7 @@
* configure.ac: Add MicroBlaze TLS support detection.
* configure: Regenerate.
* config/microblaze/microblaze-protos.h: (microblaze_cannot_force_const_mem,
- microblaze_tls_referenced_p, symbol_mentioned_p, label_mentioned_p):
+ microblaze_tls_referenced_p, symbol_mentioned_p, label_mentioned_p):
Add prototypes.
* config/microblaze/microblaze.c (microblaze_address_type): Add ADDRESS_TLS
and tls_reloc address types.
@@ -188,7 +188,7 @@
PR target/56591
* config/avr/avr.c (avr_print_operand): Add space after '%c' in
output_operand_lossage message.
-
+
2013-03-11 Richard Earnshaw <[email protected]>
PR target/56470
@@ -533,9 +533,9 @@
2013-03-04 David Holsgrove <[email protected]>
- * config/microblaze/microblaze.c (microblaze_valid_pic_const): New
+ * config/microblaze/microblaze.c (microblaze_valid_pic_const): New
(microblaze_legitimate_pic_operand): Likewise
- * config/microblaze/microblaze.h (LEGITIMATE_PIC_OPERAND_P): calls
+ * config/microblaze/microblaze.h (LEGITIMATE_PIC_OPERAND_P): calls
new function microblaze_legitimate_pic_operand
* config/microblaze/microblaze-protos.h
(microblaze_legitimate_pic_operand): Declare.
@@ -587,8 +587,8 @@
DRIVER_SELF_SPECS.
* config/microblaze/microblaze.md: New bswapsi2 and bswaphi2.
instructions emitted if TARGET_REORDER.
- * config/microblaze/microblaze.opt: New option -mxl-reorder set to 1
- or 0 for -m/-mno case, but initialises as 2 to detect default use case
+ * config/microblaze/microblaze.opt: New option -mxl-reorder set to 1
+ or 0 for -m/-mno case, but initialises as 2 to detect default use case
separately.
2013-03-01 Xinliang David Li <[email protected]>
@@ -921,7 +921,7 @@
Nathan Froyd <[email protected]>
Chao-ying Fu <[email protected]>
* doc/extend.texi: (micromips, nomicromips, nocompression):
- Document new function attributes.
+ Document new function attributes.
* doc/invoke.texi (minterlink-compressed, mmicromips,
m14k, m14ke, m14kec): Document new options.
(minterlink-mips16): Update documentation.
@@ -1071,7 +1071,7 @@
Chao-ying Fu <[email protected]>
* doc/extend.texi: (micromips, nomicromips, nocompression):
- Document new function attributes.
+ Document new function attributes.
* doc/invoke.texi (minterlink-compressed, mmicromips,
m14k, m14ke, m14kec): Document new options.
(minterlink-mips16): Update documentation.
@@ -1375,7 +1375,7 @@
* config/microblaze/microblaze.c: microblaze_has_clz = 0
Add version check for v8.10.a to enable microblaze_has_clz
- * config/microblaze/microblaze.h: Add TARGET_HAS_CLZ as combined
+ * config/microblaze/microblaze.h: Add TARGET_HAS_CLZ as combined
version and TARGET_PATTERN_COMPARE check
* config/microblaze/microblaze.md: New clzsi2 instruction
@@ -1397,7 +1397,7 @@
* sel-sched.c: Include ira.h.
(implicit_clobber_conflict_p): New function.
(moveup_expr): Use it.
- * Makefile.in (sel-sched.o): Depend on ira.h.
+ * Makefile.in (sel-sched.o): Depend on ira.h.
2013-02-19 Richard Biener <[email protected]>
@@ -1495,10 +1495,10 @@
2013-02-16 Edgar E. Iglesias <[email protected]>
- * config/microblaze/microblaze.c (microblaze_asm_trampoline_template):
+ * config/microblaze/microblaze.c (microblaze_asm_trampoline_template):
Replace with a microblaze version.
(microblaze_trampoline_init): Adapt for microblaze.
- * gcc/config/microblaze/microblaze.h (TRAMPOLINE_SIZE): Adapt for
+ * gcc/config/microblaze/microblaze.h (TRAMPOLINE_SIZE): Adapt for
microblaze.
2013-02-16 Jakub Jelinek <[email protected]>
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
