From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1005) id 41273385700C; Thu, 12 Oct 2023 21:54:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 41273385700C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1697147653; bh=X39V6z7hy9SXvPV/CRcJ/cPmXSQPZcggHLGQXQCSC2c=; h=From:To:Subject:Date:From; b=f8+RuJngO1bxV4YYNiybPrLo1PlFVWj7lwBtakBWfdoTS7tgMKT0OBGzJj2c9p7tC S80waYOU5t0M6c029UFdrHasAUeHcoVqIkTeCyqQLtl9Y6OXB+AZuyIR5Aa4TBSEne IgMOoUvxx5dFr9lzEYuRyDU/Cs3pwLbnu/UQutuk= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Michael Meissner To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/meissner/heads/work139)] Revert patches X-Act-Checkin: gcc X-Git-Author: Michael Meissner X-Git-Refname: refs/users/meissner/heads/work139 X-Git-Oldrev: 310c14a9e916faaf9cba3c0b7cc1bda299683730 X-Git-Newrev: 8f3b5e556cf7cc9b0dee82c4f9edd0a1f890f49a Message-Id: <20231012215413.41273385700C@sourceware.org> Date: Thu, 12 Oct 2023 21:54:13 +0000 (GMT) List-Id: https://gcc.gnu.org/g:8f3b5e556cf7cc9b0dee82c4f9edd0a1f890f49a commit 8f3b5e556cf7cc9b0dee82c4f9edd0a1f890f49a Author: Michael Meissner Date: Thu Oct 12 00:29:49 2023 -0400 Revert patches Diff: --- gcc/config/rs6000/rs6000.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc index 6ffd982c7bc..2d1d379e128 100644 --- a/gcc/config/rs6000/rs6000.cc +++ b/gcc/config/rs6000/rs6000.cc @@ -10370,6 +10370,7 @@ can_be_built_by_li_lis_and_rldicl (HOST_WIDE_INT c, int *shift, /* Leading zeros may be cleaned by rldicl with a mask. Change leading zeros to ones and then recheck it. */ int lz = clz_hwi (c); +<<<<<<< HEAD <<<<<<< HEAD /* If lz == 0, the left shift is undefined. */ @@ -10385,6 +10386,8 @@ can_be_built_by_li_lis_and_rldicl (HOST_WIDE_INT c, int *shift, if (!lz) return false; +======= +>>>>>>> ab63444d033 (Revert patches) HOST_WIDE_INT unmask_c = c | (HOST_WIDE_INT_M1U << (HOST_BITS_PER_WIDE_INT - lz)); int n;