[gcc(refs/users/marxin/heads/PR93800-ppc-alignment-v2)] Restore alignment in rs6000 target.

[Martin Liska]

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

commit d38186d6f649be4824653a89dfdcb01079f4cd4f
Author: Martin Liska <mliska@suse.cz>
Date:   Thu Mar 5 13:47:15 2020 +0100

    Restore alignment in rs6000 target.
    
    gcc/ChangeLog:
    
    2020-03-05  Martin Liska  <mliska@suse.cz>
    
            PR target/93800
            * config/rs6000/rs6000.c (rs6000_option_override_internal):
            Remove set of str_align_loops and str_align_jumps as these
            should be set in previous 2 conditions in the function.
    
    gcc/testsuite/ChangeLog:
    
    2020-03-09  Martin Liska  <mliska@suse.cz>
    
            PR target/93800
            * gcc.target/powerpc/pr93800.c: New test.

Diff:
---
 gcc/config/rs6000/rs6000.c                 |  5 -----
 gcc/testsuite/gcc.target/powerpc/pr93800.c | 13 +++++++++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index ecbf7ae0c59..848a4ef451e 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -4363,11 +4363,6 @@ rs6000_option_override_internal (bool global_init_p)
 		  str_align_loops = "16";
 		}
 	    }
-
-	  if (flag_align_jumps && !str_align_jumps)
-	    str_align_jumps = "16";
-	  if (flag_align_loops && !str_align_loops)
-	    str_align_loops = "16";
 	}
 
       /* Arrange to save and restore machine status around nested functions.  */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr93800.c b/gcc/testsuite/gcc.target/powerpc/pr93800.c
new file mode 100644
index 00000000000..40ad7da3cac
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/pr93800.c
@@ -0,0 +1,13 @@
+/* { dg-do compile } */
+/* { dg-options "-m32 -mcpu=860 -O2" } */
+/* { dg-final { scan-assembler-not "\\.p2align 4" } } */
+
+volatile int g;
+int f(int a, int b)
+{
+	int i;
+
+	for (i = 0; i < b; i++)
+		a += g;
+	return a;
+}