From patchwork Wed May 31 12:22:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 101407 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2839291vqr; Wed, 31 May 2023 05:27:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4MIwupHlbnh/myiHbhd3GWmJn0LN7FPn+uqBMwlwvpfsqAFaLy9fFTozsVlLHFiO2kKdgF X-Received: by 2002:a17:907:ea7:b0:974:1ef1:81fb with SMTP id ho39-20020a1709070ea700b009741ef181fbmr4787983ejc.22.1685536034722; Wed, 31 May 2023 05:27:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685536034; cv=none; d=google.com; s=arc-20160816; b=dBcMXCC/MMd1G/Y9dwyAOeyrMdWs3q/7+zO/Bon83zs4252ITaEzZ36707i5teuaJ8 6+w6EgzYd6wZBNPzh1BtZfvE5UqLsufeDBRGzyrFBtkhPeTRJcpFvtuwXN7qdk2iRI/Z +DC/lSWHDyJKPN4+n5TjC55THx0hzJ6BROUGGGRl+fN65kV6RxL4ubJgPFN0M+0XKSO2 0+meyn43nFiqIvIsnW6tixWw/p49KCsk1mnwVThc0eO+BgJChZH7SeLDQ8plJgRtwswn B81XB20xYMIqn2R5lWFD8jpdtzxSDUIn6asgGBHMikcqLZm+x5ykHwInoD+VIoL8Vh1o aSBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=jQuX/GknpqBSA7WRJ0+euIjI6LJPstR2PhpBzEv8kCg=; b=qkbVbPRzTvuVIGXdX+dk38ng2Zk/23BTtEIs6x3Tva4kxyKGXhuGDmgufncFNMIvGr 4gGeow9pc5wW61gOobVRWi57y0nkTTm+D3zM2Y777MsHJL8+ss+mSmwJ9Z5I+vqKOeK8 FW4+RVLzfOy3MpNRYc1vterFePAIzz1TkiZ5OUswWZdum+PqZtw6lOWBdz3mMFtcOitw PpXDptFkVgvVwOa4TJCPxSbVkkblSsdFmqUNCKR9Mhr7861vlc1C7llRPJtcy0tOP2de diEUIOFF/1jxQMONoMJv2DwzHkOqVl6TrcAoSzhua//1l1xGx1AsGeX9fWi2c1JCMMCy oZOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=FWyeVpvI; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id iy21-20020a170907819500b0096f4c6a68easi1686069ejc.1041.2023.05.31.05.27.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 May 2023 05:27:14 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=FWyeVpvI; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DEEC1385697F for ; Wed, 31 May 2023 12:24:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DEEC1385697F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685535864; bh=jQuX/GknpqBSA7WRJ0+euIjI6LJPstR2PhpBzEv8kCg=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=FWyeVpvIZxpZzWvLeQltF9s8/7iQh3wOyNV3wtsXuDmeq0iZg23+H/Ql6oO5cJ3MJ CbVPp8CmC/1FWRkCqoiSHEuVHDG+UfXFb7WqdGqE/LInfe1puYT1zaZic41WlUWpBG +Bdwf236n3bbK3Sqoysl+pbo/O0TEBbOZd7sBfQM= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 074753854E4D for ; Wed, 31 May 2023 12:22:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 074753854E4D Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-275-i2U13xx6PYGy7H0SOJZ8TQ-1; Wed, 31 May 2023 08:22:56 -0400 X-MC-Unique: i2U13xx6PYGy7H0SOJZ8TQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 14A9E811E8E; Wed, 31 May 2023 12:22:56 +0000 (UTC) Received: from localhost (unknown [10.42.28.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id D58B940C6EC4; Wed, 31 May 2023 12:22:55 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Replace obsolete shell syntax in configure.ac Date: Wed, 31 May 2023 13:22:55 +0100 Message-Id: <20230531122255.4117505-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767412633050493264?= X-GMAIL-MSGID: =?utf-8?q?1767412633050493264?= Tested powerpc64le-linux. Pushed to trunk. -- >8 -- The current POSIX standard says that the -a and -o operators to the 'test' utility are obsolete, and the shell operators && and || should be used instead. libstdc++-v3/ChangeLog: * configure.ac: Replace use of -o operator for test. * configure: Regenerate. --- libstdc++-v3/configure | 2 +- libstdc++-v3/configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 167aabd8fc5..4db8a284083 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -3298,7 +3298,7 @@ if test "$build" != "$host"; then *-*-darwin*,*-*-darwin*) hostos=`echo $host | sed 's/.*-darwin/darwin/'` targetos=`echo $target | sed 's/.*-darwin/darwin/'` - if test $hostos = $targetos -o $targetos = darwin ; then + if test $hostos = $targetos || test $targetos = darwin ; then GLIBCXX_IS_NATIVE=true fi ;; diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index df01f58bd83..0abe54e7b9a 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -45,7 +45,7 @@ if test "$build" != "$host"; then *-*-darwin*,*-*-darwin*) hostos=`echo $host | sed 's/.*-darwin/darwin/'` targetos=`echo $target | sed 's/.*-darwin/darwin/'` - if test $hostos = $targetos -o $targetos = darwin ; then + if test $hostos = $targetos || test $targetos = darwin ; then GLIBCXX_IS_NATIVE=true fi ;;