From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 18 Dec 2019 11:15:43 +0000 (+0100)
Subject: re PR lto/92972 (gcc/lto-wrapper.c:443: identical branches ?)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5afa32b898fe8fe9db7d163ac25e9f0f3f2b9071;p=gcc.git

re PR lto/92972 (gcc/lto-wrapper.c:443: identical branches ?)

	PR lto/92972
	* lto-wrapper.c (merge_and_complain): Use just "-fno-pie" instead of
	big ? "-fno-pie" : "-fno-pie".  Formatting fixes.  Fix comment typo.

From-SVN: r279520
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a77f573d2c4..eb5264dcc37 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-12-18  Jakub Jelinek  <jakub@redhat.com>
+
+	PR lto/92972
+	* lto-wrapper.c (merge_and_complain): Use just "-fno-pie" instead of
+	big ? "-fno-pie" : "-fno-pie".  Formatting fixes.  Fix comment typo.
+
 2019-12-17  Martin Sebor  <msebor@redhat.com>
 
 	PR c++/61339
diff --git a/gcc/lto-wrapper.c b/gcc/lto-wrapper.c
index 9a7bbd0c022..9ee1d930364 100644
--- a/gcc/lto-wrapper.c
+++ b/gcc/lto-wrapper.c
@@ -408,7 +408,7 @@ merge_and_complain (struct cl_decoded_option **decoded_options,
   /* Merge PIC options:
       -fPIC + -fpic = -fpic
       -fPIC + -fno-pic = -fno-pic
-      -fpic/-fPIC + nothin = nothing.  
+      -fpic/-fPIC + nothing = nothing.
      It is a common mistake to mix few -fPIC compiled objects into otherwise
      non-PIC code.  We do not want to build everything with PIC then.
 
@@ -438,9 +438,10 @@ merge_and_complain (struct cl_decoded_option **decoded_options,
 			   && pie_option->opt_index == OPT_fPIE;
 	        (*decoded_options)[j].opt_index = big ? OPT_fPIE : OPT_fpie;
 		if (pie_option->value)
-	          (*decoded_options)[j].canonical_option[0] = big ? "-fPIE" : "-fpie";
+	          (*decoded_options)[j].canonical_option[0]
+		    = big ? "-fPIE" : "-fpie";
 		else
-	          (*decoded_options)[j].canonical_option[0] = big ? "-fno-pie" : "-fno-pie";
+	          (*decoded_options)[j].canonical_option[0] = "-fno-pie";
 		(*decoded_options)[j].value = pie_option->value;
 	        j++;
 	      }
@@ -482,7 +483,7 @@ merge_and_complain (struct cl_decoded_option **decoded_options,
 		  {
 	            (*decoded_options)[j].opt_index = OPT_fpie;
 	            (*decoded_options)[j].canonical_option[0]
-			 = pic_option->value ? "-fpie" : "-fno-pie";
+		      = pic_option->value ? "-fpie" : "-fno-pie";
 		  }
 		else if (!pic_option->value)
 		  (*decoded_options)[j].canonical_option[0] = "-fno-pie";