From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 7FEA9395CC7D; Wed, 2 Dec 2020 16:38:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7FEA9395CC7D MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-5670] libstdc++: Use libatomic for tests on all 32-bit powerpc targets X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: af4180513836806e2b351d516af55f6664c8821a X-Git-Newrev: dd053eea0be4f3ec8b76fb2e103a13a3977bcf9f Message-Id: <20201202163843.7FEA9395CC7D@sourceware.org> Date: Wed, 2 Dec 2020 16:38:43 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2020 16:38:43 -0000 https://gcc.gnu.org/g:dd053eea0be4f3ec8b76fb2e103a13a3977bcf9f commit r11-5670-gdd053eea0be4f3ec8b76fb2e103a13a3977bcf9f Author: Jonathan Wakely Date: Wed Dec 2 16:37:56 2020 +0000 libstdc++: Use libatomic for tests on all 32-bit powerpc targets In addition to the existing powerpc targets, powerpc64 needs libatomic for 64-bit atomics when testing the 32-bit multilib with -m32. Adjust the existing target checks to match all 32-bit powerpc targets, but not 64-bit ones. libstdc++-v3/ChangeLog: * testsuite/lib/dg-options.exp (add_options_for_libatomic): Replace powerpc-ibm-aix* and powerpc*-*-darwin* with check for powerpc && ilp32. Diff: --- libstdc++-v3/testsuite/lib/dg-options.exp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/testsuite/lib/dg-options.exp b/libstdc++-v3/testsuite/lib/dg-options.exp index d3f61cb5267..0102acf65a2 100644 --- a/libstdc++-v3/testsuite/lib/dg-options.exp +++ b/libstdc++-v3/testsuite/lib/dg-options.exp @@ -257,13 +257,14 @@ proc add_options_for_net_ts { flags } { return $flags } -# Add to FLAGS all the target-specific flags to link to libatomic, if required. +# Add to FLAGS all the target-specific flags to link to libatomic, +# if required for atomics on pointers and 64-bit types. proc add_options_for_libatomic { flags } { if { [istarget hppa*-*-hpux*] - || [istarget powerpc-ibm-aix*] - || [istarget powerpc*-*-darwin*] - || [istarget riscv*-*-*] } { + || ([istarget powerpc*-*-*] && [check_effective_target_ilp32]) + || [istarget riscv*-*-*] + } { return "$flags -L../../libatomic/.libs -latomic" } return $flags