diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 48488afcf01..11d53e02ddf 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2012-02-23 Ulrich Weigand + + * acinclude.m4: Use HAVE_INITFINI_ARRAY_SUPPORT instead of + HAVE_INITFINI_ARRAY to work around namespace pollution in + certain versions of newlib system headers. + * config.in: Regenerate. + * configure: Regenerate. + * config/initfini-array.h: Use HAVE_INITFINI_ARRAY_SUPPORT + instead of HAVE_INITFINI_ARRAY. + 2012-02-22 Uros Bizjak PR target/52330 diff --git a/gcc/acinclude.m4 b/gcc/acinclude.m4 index 0c6170ca143..a3948471048 100644 --- a/gcc/acinclude.m4 +++ b/gcc/acinclude.m4 @@ -486,7 +486,7 @@ changequote([,])dnl enable_initfini_array=$gcc_cv_initfini_array ]) if test $enable_initfini_array = yes; then - AC_DEFINE(HAVE_INITFINI_ARRAY, 1, + AC_DEFINE(HAVE_INITFINI_ARRAY_SUPPORT, 1, [Define .init_array/.fini_array sections are available and working.]) fi]) diff --git a/gcc/config.in b/gcc/config.in index 28332110dbb..9b8d206c98d 100644 --- a/gcc/config.in +++ b/gcc/config.in @@ -1123,7 +1123,7 @@ /* Define .init_array/.fini_array sections are available and working. */ #ifndef USED_FOR_TARGET -#undef HAVE_INITFINI_ARRAY +#undef HAVE_INITFINI_ARRAY_SUPPORT #endif diff --git a/gcc/config/initfini-array.h b/gcc/config/initfini-array.h index bb48c70a920..ade9fcd634c 100644 --- a/gcc/config/initfini-array.h +++ b/gcc/config/initfini-array.h @@ -19,7 +19,7 @@ along with GCC; see the file COPYING3. If not see . */ -#ifdef HAVE_INITFINI_ARRAY +#ifdef HAVE_INITFINI_ARRAY_SUPPORT #define USE_INITFINI_ARRAY diff --git a/gcc/configure b/gcc/configure index 4bca79075c4..94b33cee6b7 100755 --- a/gcc/configure +++ b/gcc/configure @@ -22515,7 +22515,7 @@ fi if test $enable_initfini_array = yes; then -$as_echo "#define HAVE_INITFINI_ARRAY 1" >>confdefs.h +$as_echo "#define HAVE_INITFINI_ARRAY_SUPPORT 1" >>confdefs.h fi diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 61d9b591702..379b858c0df 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,9 @@ +2012-02-23 Ulrich Weigand + + * config/ia64/crtbegin.S: Use HAVE_INITFINI_ARRAY_SUPPORT + instead of HAVE_INITFINI_ARRAY. + * config/ia64/crtend.S: Likewise. + 2012-02-20 Kai Tietz PR libstdc++/52300 diff --git a/libgcc/config/ia64/crtbegin.S b/libgcc/config/ia64/crtbegin.S index 638489990d5..cfb54d310a8 100644 --- a/libgcc/config/ia64/crtbegin.S +++ b/libgcc/config/ia64/crtbegin.S @@ -61,7 +61,7 @@ __dso_handle: .hidden __dso_handle -#ifdef HAVE_INITFINI_ARRAY +#ifdef HAVE_INITFINI_ARRAY_SUPPORT .section .fini_array, "a" data8 @fptr(__do_global_dtors_aux) @@ -70,7 +70,7 @@ __dso_handle: data8 @fptr(__do_jv_register_classes) data8 @fptr(__do_global_ctors_aux) -#else /* !HAVE_INITFINI_ARRAY */ +#else /* !HAVE_INITFINI_ARRAY_SUPPORT */ /* * Fragment of the ELF _fini routine that invokes our dtor cleanup. * @@ -117,7 +117,7 @@ __dso_handle: mov b6 = r2 br.call.sptk.many b0 = b6 } -#endif /* !HAVE_INITFINI_ARRAY */ +#endif /* !HAVE_INITFINI_ARRAY_SUPPORT */ .section .text .align 32 diff --git a/libgcc/config/ia64/crtend.S b/libgcc/config/ia64/crtend.S index a904af9cfd9..9ee151711c5 100644 --- a/libgcc/config/ia64/crtend.S +++ b/libgcc/config/ia64/crtend.S @@ -39,10 +39,10 @@ __DTOR_END__: __JCR_END__: data8 0 -#ifdef HAVE_INITFINI_ARRAY +#ifdef HAVE_INITFINI_ARRAY_SUPPORT .global __do_global_ctors_aux .hidden __do_global_ctors_aux -#else /* !HAVE_INITFINI_ARRAY */ +#else /* !HAVE_INITFINI_ARRAY_SUPPORT */ /* * Fragment of the ELF _init routine that invokes our dtor cleanup. * @@ -71,7 +71,7 @@ __JCR_END__: br.call.sptk.many b0 = b6 ;; } -#endif /* !HAVE_INITFINI_ARRAY */ +#endif /* !HAVE_INITFINI_ARRAY_SUPPORT */ .text .align 32