From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id 9B0D63987907; Thu, 17 Sep 2020 16:48:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9B0D63987907 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1600361285; bh=MUQ9f5hUXtnrTqwbhcSW0yVvg3uNB5txyaQZDg1BX8Y=; h=From:To:Subject:Date:From; b=ErZjkcZz2b5cVLUGLrp69nD0H4666KCAsCXLNiiXJD0aYVVc53sxTyxCGyRg0WJl4 US/htMbNyo6EWdcQE7xx7/0xndvkNqePZsWKxixJjDzpDkw1w0pZFoenUHG5A7mu8N BFp1F6FpHQEZ+kltjG5M0PlakW2LNpI7MnrOi804= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/redhat/heads/gcc-8-branch)] libstdc++: Fix freestanding build (PR 92376) X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/vendors/redhat/heads/gcc-8-branch X-Git-Oldrev: d6c8aad430338fdc4017918a9e520949a4a01d9e X-Git-Newrev: 1cf81be019eb7993c1a9946ecdb3f8285c8a95f4 Message-Id: <20200917164805.9B0D63987907@sourceware.org> Date: Thu, 17 Sep 2020 16:48:05 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Sep 2020 16:48:05 -0000 https://gcc.gnu.org/g:1cf81be019eb7993c1a9946ecdb3f8285c8a95f4 commit 1cf81be019eb7993c1a9946ecdb3f8285c8a95f4 Author: Jonathan Wakely Date: Wed Feb 26 14:20:55 2020 +0000 libstdc++: Fix freestanding build (PR 92376) Explicitly declare aligned alloc functions for freestanding, because doesn't declare them. Backport from mainline 2020-01-17 Jonathan Wakely PR libstdc++/92376 * libsupc++/new_opa.cc [!_GLIBCXX_HOSTED]: Declare allocation functions if they were detected by configure. Diff: --- libstdc++-v3/ChangeLog | 9 +++++++++ libstdc++-v3/libsupc++/new_opa.cc | 15 +++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8b4637246b9..175107b5b30 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2020-02-26 Jonathan Wakely + + Backport from mainline + 2020-01-17 Jonathan Wakely + + PR libstdc++/92376 + * libsupc++/new_opa.cc [!_GLIBCXX_HOSTED]: Declare allocation + functions if they were detected by configure. + 2020-02-26 Jonathan Wakely Backport from mainline diff --git a/libstdc++-v3/libsupc++/new_opa.cc b/libstdc++-v3/libsupc++/new_opa.cc index 64b9ccb3493..e48982f7a08 100644 --- a/libstdc++-v3/libsupc++/new_opa.cc +++ b/libstdc++-v3/libsupc++/new_opa.cc @@ -42,6 +42,21 @@ extern "C" void *memalign(std::size_t boundary, std::size_t size); using std::new_handler; using std::bad_alloc; +#if ! _GLIBCXX_HOSTED +extern "C" +{ +# if _GLIBCXX_HAVE_ALIGNED_ALLOC + void *aligned_alloc(size_t alignment, size_t size); +# elif _GLIBCXX_HAVE__ALIGNED_MALLOC + void *_aligned_malloc(size_t size, size_t alignment); +# elif _GLIBCXX_HAVE_POSIX_MEMALIGN + void *posix_memalign(void **, size_t alignment, size_t size); +# elif _GLIBCXX_HAVE_MEMALIGN + void *memalign(size_t alignment, size_t size); +# endif +} +#endif + namespace __gnu_cxx { #if _GLIBCXX_HAVE_ALIGNED_ALLOC using ::aligned_alloc;