From 817a788f9eb01eff367191401d48f2aaa8d4f428 Mon Sep 17 00:00:00 2001
From: Caroline Tice <cmtice@google.com>
Date: Wed, 10 Feb 2016 14:40:41 -0800
Subject: Unify ChromeOS and Android versions of GCC.

This CL updates Android's GCC to match ChromeOS's GCC (with
appropriate patches applied in both places to make sure no
cherry-picked changes are lost).

Change-Id: I390140c449b0e5df9ee78a06268319c8c510302f
---
 .../testsuite/gcc.target/aarch64/madd_after_asm_1.c | 14 --------------
 gcc-4.9/gcc/testsuite/gcc.target/aarch64/pr62040.c  | 21 ---------------------
 gcc-4.9/gcc/testsuite/gcc.target/aarch64/pr62262.c  | 20 --------------------
 .../gcc/testsuite/gcc.target/powerpc/lvsl-lvsr.c    |  2 +-
 .../testsuite/gcc.target/powerpc/warn-lvsl-lvsr.c   |  2 +-
 5 files changed, 2 insertions(+), 57 deletions(-)

(limited to 'gcc-4.9/gcc/testsuite/gcc.target')

diff --git a/gcc-4.9/gcc/testsuite/gcc.target/aarch64/madd_after_asm_1.c b/gcc-4.9/gcc/testsuite/gcc.target/aarch64/madd_after_asm_1.c
index 321d8f002..523941d47 100644
--- a/gcc-4.9/gcc/testsuite/gcc.target/aarch64/madd_after_asm_1.c
+++ b/gcc-4.9/gcc/testsuite/gcc.target/aarch64/madd_after_asm_1.c
@@ -12,17 +12,3 @@ test (int a, double b, int c, int d, int e)
                       );
   return c * d + e;
 }
-/* { dg-do assemble } */
-/* { dg-options "-O2 -mfix-cortex-a53-835769" } */
-
-int
-test (int a, double b, int c, int d, int e)
-{
-  double result;
-  __asm__ __volatile ("// %0, %1"
-                      : "=w" (result)
-                      : "0" (b)
-                      :    /* No clobbers */
-                      );
-  return c * d + e;
-}
diff --git a/gcc-4.9/gcc/testsuite/gcc.target/aarch64/pr62040.c b/gcc-4.9/gcc/testsuite/gcc.target/aarch64/pr62040.c
index c6cae4d5b..cfb4979f8 100644
--- a/gcc-4.9/gcc/testsuite/gcc.target/aarch64/pr62040.c
+++ b/gcc-4.9/gcc/testsuite/gcc.target/aarch64/pr62040.c
@@ -19,24 +19,3 @@ foo ()
   int32x4_t out = vtrn1q_s32 (xxx, xxx);
   bar (out);
 }
-/* { dg-do compile } */
-/* { dg-options "-g -Os" } */
-
-#include "arm_neon.h"
-
-extern void bar (int32x4_t);
-
-void
-foo ()
-{
-  int32x4x4_t rows;
-  uint64x2x2_t row01;
-
-  row01.val[0] = vreinterpretq_u64_s32 (rows.val[0]);
-  row01.val[1] = vreinterpretq_u64_s32 (rows.val[1]);
-  uint64x1_t row3l = vget_low_u64 (row01.val[0]);
-  row01.val[0] = vcombine_u64 (vget_low_u64 (row01.val[1]), row3l);
-  int32x4_t xxx = vreinterpretq_s32_u64 (row01.val[0]);
-  int32x4_t out = vtrn1q_s32 (xxx, xxx);
-  bar (out);
-}
diff --git a/gcc-4.9/gcc/testsuite/gcc.target/aarch64/pr62262.c b/gcc-4.9/gcc/testsuite/gcc.target/aarch64/pr62262.c
index 20763b499..5bf90bf7f 100644
--- a/gcc-4.9/gcc/testsuite/gcc.target/aarch64/pr62262.c
+++ b/gcc-4.9/gcc/testsuite/gcc.target/aarch64/pr62262.c
@@ -18,23 +18,3 @@ int foo(int value)
     int packed = (unsigned)(value << 9) >> 9;
     return packed;
 }
-/* { dg-do compile } */
-/* { dg-options "-O2 -fprofile-use" } */
-
-static inline int CLZ(int mask) {
-   return mask ? __builtin_clz(mask) : 32;
-}
-
-int foo(int value)
-{
-    if (value == 0)
-        return 0;
-
-    int bias = CLZ(value);
-    value >>= bias;
-    int zeros = CLZ(value << 1);
-    value <<= zeros;
-
-    int packed = (unsigned)(value << 9) >> 9;
-    return packed;
-}
diff --git a/gcc-4.9/gcc/testsuite/gcc.target/powerpc/lvsl-lvsr.c b/gcc-4.9/gcc/testsuite/gcc.target/powerpc/lvsl-lvsr.c
index 71dd0a24a..da32337e7 100644
--- a/gcc-4.9/gcc/testsuite/gcc.target/powerpc/lvsl-lvsr.c
+++ b/gcc-4.9/gcc/testsuite/gcc.target/powerpc/lvsl-lvsr.c
@@ -3,7 +3,7 @@
    causes them to appear twice in the file.  */
 
 /* { dg-do compile { target { powerpc64le-*-* } } } */
-/* { dg-options "-O0 -Wno-deprecated" } */
+/* { dg-options "-mcpu=power7 -O0 -Wno-deprecated" } */
 /* { dg-final { scan-assembler-times "lvsl" 2 } } */
 /* { dg-final { scan-assembler-times "lvsr" 2 } } */
 /* { dg-final { scan-assembler-times "lxvd2x" 2 } } */
diff --git a/gcc-4.9/gcc/testsuite/gcc.target/powerpc/warn-lvsl-lvsr.c b/gcc-4.9/gcc/testsuite/gcc.target/powerpc/warn-lvsl-lvsr.c
index bf889aaa2..db81e17eb 100644
--- a/gcc-4.9/gcc/testsuite/gcc.target/powerpc/warn-lvsl-lvsr.c
+++ b/gcc-4.9/gcc/testsuite/gcc.target/powerpc/warn-lvsl-lvsr.c
@@ -1,7 +1,7 @@
 /* Test for deprecation messages on use of lvsl and lvsr for little endian.  */
 
 /* { dg-do compile { target { powerpc64le-*-* } } } */
-/* { dg-options "-O0 -Wdeprecated" } */
+/* { dg-options "-maltivec -O0 -Wdeprecated" } */
 
 #include <altivec.h>
 
-- 
cgit v1.2.3