public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Michael Meissner <meissner@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc(refs/users/meissner/heads/work139)] Revert patches
Date: Mon, 16 Oct 2023 18:23:51 +0000 (GMT)	[thread overview]
Message-ID: <20231016182351.52104385CC93@sourceware.org> (raw)

https://gcc.gnu.org/g:f2a90e4af4b6d6b3cefb9e2d478095638bf4054e

commit f2a90e4af4b6d6b3cefb9e2d478095638bf4054e
Author: Michael Meissner <meissner@linux.ibm.com>
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 6ffd982c7bcf..2d1d379e1287 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;

             reply	other threads:[~2023-10-16 18:23 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-16 18:23 Michael Meissner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-10-12 21:54 Michael Meissner
2023-10-12  4:29 Michael Meissner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231016182351.52104385CC93@sourceware.org \
    --to=meissner@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).