PR libstdc++/92143 adjust for OS X aligned_alloc behaviour

OS X 10.15 adds aligned_alloc but it has the same restriction as the AIX
version, namely that alignments smaller than sizeof(void*) are not
supported.

Backport from mainline
2019-10-18  Jonathan Wakely  <jwakely@redhat.com>

	PR libstdc++/92143
	* libsupc++/new_opa.cc (operator new) [__APPLE__]: Increase alignment
	to at least sizeof(void*).

From-SVN: r277386

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ca192d1bd63d6145e27a48c566f2a2d13f5b3818..00cab77041743df188f1c9cbb3e5e4a0070fa11b 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,12 @@
 2019-10-24  Jonathan Wakely  <jwakely@redhat.com>
 
+       Backport from mainline
+       2019-10-18  Jonathan Wakely  <jwakely@redhat.com>
+
+       PR libstdc++/92143
+       * libsupc++/new_opa.cc (operator new) [__APPLE__]: Increase alignment
+       to at least sizeof(void*).
+
        Backport from mainline
        2019-06-06  Jonathan Wakely  <jwakely@redhat.com>
 

diff --git a/libstdc++-v3/libsupc++/new_opa.cc b/libstdc++-v3/libsupc++/new_opa.cc
index 0303ecde6bd946e8e50ad951511cb11464626010..8143c129bc62e7464117f4838a74639cd13db63f 100644 (file)
--- a/libstdc++-v3/libsupc++/new_opa.cc
+++ b/libstdc++-v3/libsupc++/new_opa.cc
@@ -114,9 +114,10 @@ operator new (std::size_t sz, std::align_val_t al)
     sz = 1;
 
 #if _GLIBCXX_HAVE_ALIGNED_ALLOC
-# ifdef _AIX
+# if defined _AIX || defined __APPLE__
   /* AIX 7.2.0.0 aligned_alloc incorrectly has posix_memalign's requirement
-   * that alignment is a multiple of sizeof(void*).  */
+   * that alignment is a multiple of sizeof(void*).
+   * OS X 10.15 has the same requirement.  */
   if (align < sizeof(void*))
     align = sizeof(void*);
 # endif