aboutsummaryrefslogtreecommitdiff
path: root/libgcc
diff options
context:
space:
mode:
authorUlrich Weigand <uweigand@de.ibm.com>2012-02-23 10:16:39 +0000
committerUlrich Weigand <uweigand@gcc.gnu.org>2012-02-23 10:16:39 +0000
commite10e461eef055d717f9ec46708488a7a25c9d0b1 (patch)
tree6e8b20f8fae47a4ac30a16dbb56169aa34f079da /libgcc
parentafe03c233e7fc3e1d7d37ca95f2f72cab40248a0 (diff)
downloadgcc-e10e461eef055d717f9ec46708488a7a25c9d0b1.zip
gcc-e10e461eef055d717f9ec46708488a7a25c9d0b1.tar.gz
gcc-e10e461eef055d717f9ec46708488a7a25c9d0b1.tar.bz2
acinclude.m4: Use HAVE_INITFINI_ARRAY_SUPPORT instead of HAVE_INITFINI_ARRAY to work around...
gcc/ * 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. libgcc/ * config/ia64/crtbegin.S: Use HAVE_INITFINI_ARRAY_SUPPORT instead of HAVE_INITFINI_ARRAY. * config/ia64/crtend.S: Likewise. From-SVN: r184503
Diffstat (limited to 'libgcc')
-rw-r--r--libgcc/ChangeLog6
-rw-r--r--libgcc/config/ia64/crtbegin.S6
-rw-r--r--libgcc/config/ia64/crtend.S6
3 files changed, 12 insertions, 6 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 61d9b59..379b858 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-23 Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
+
+ * config/ia64/crtbegin.S: Use HAVE_INITFINI_ARRAY_SUPPORT
+ instead of HAVE_INITFINI_ARRAY.
+ * config/ia64/crtend.S: Likewise.
+
2012-02-20 Kai Tietz <ktietz@redhat.com>
PR libstdc++/52300
diff --git a/libgcc/config/ia64/crtbegin.S b/libgcc/config/ia64/crtbegin.S
index 6384899..cfb54d3 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 a904af9..9ee1517 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