Re: [PATCH 4/4][ARM][PR target/65697][5.1] Fix tests for __sync_builtins.

[Matthew Wahab <matthew.wahab@foss.arm.com>]

[-- Attachment #1: Type: text/plain, Size: 1067 bytes --]

Ping. Updated patch attached.

Also, retested for arm-none-linux-gnueabihf with native bootstrap and make
check and for arm-none-eabi with cross compiled make check.

On 02/07/15 14:18, Matthew Wahab wrote:
> This patch backports fixes for the __sync builtin tests.
>
> The trunk patch submission is at
> https://gcc.gnu.org/ml/gcc-patches/2015-07/msg00031.html
> The commit is at https://gcc.gnu.org/ml/gcc-cvs/2015-07/msg00025.html
>
> Tested the series for arm-none-linux-gnueabihf with check-gcc
>
> Ok for the branch?
> Matthew
>
> gcc/testsuite
> 2015-07-02  Matthew Wahab  <matthew.wahab@arm.com>
>
>      Backport from trunk:
>      2015-07-01  Matthew Wahab  <matthew.wahab@arm.com>
>
>      * gcc.target/arm/armv8-sync-comp-swap.c: Replace
>      'do-require-effective-target' with 'dg-require-effective-target'.
>      * gcc.target/arm/armv8-sync-op-full.c: Likewise.
>      * gcc.target/arm/armv8-sync-op-release.c: Likewise.
>      * gcc.target/arm/armv8-sync-op-acquire.c: Likewise.  Also, replace
>      'stlex' with 'strex' as the expected output.
>


[-- Attachment #2: 0004-2015-07-01-Matthew-Wahab-matthew.wahab-arm.com.patch --]
[-- Type: text/x-patch, Size: 3290 bytes --]

From d058686fe1027927a5fdfbb81a83526e3f9b9d6d Mon Sep 17 00:00:00 2001
From: mwahab <mwahab@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 1 Jul 2015 12:16:01 +0000
Subject: [PATCH 4/4] 2015-07-01  Matthew Wahab  <matthew.wahab@arm.com>

	Backport
	* gcc.target/arm/armv8-sync-comp-swap.c: Replace
	'do-require-effective-target' with 'dg-require-effective-target'.
	* gcc.target/arm/armv8-sync-op-full.c: Likewise.
	* gcc.target/arm/armv8-sync-op-release.c: Likewise.
	* gcc.target/arm/armv8-sync-op-acquire.c: Likewise.  Also, replace
        'stlex' with 'strex' as the expected output.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@225241 138bc75d-0d04-0410-961f-82ee72b054a4

Conflicts:
	gcc/testsuite/ChangeLog

Change-Id: I19f2013f7bdd2dd035f36f0f7c9829cf6a86fb8e
---
 gcc/testsuite/gcc.target/arm/armv8-sync-comp-swap.c  | 2 +-
 gcc/testsuite/gcc.target/arm/armv8-sync-op-acquire.c | 4 ++--
 gcc/testsuite/gcc.target/arm/armv8-sync-op-full.c    | 2 +-
 gcc/testsuite/gcc.target/arm/armv8-sync-op-release.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gcc/testsuite/gcc.target/arm/armv8-sync-comp-swap.c b/gcc/testsuite/gcc.target/arm/armv8-sync-comp-swap.c
index f96c81a..0e95986 100644
--- a/gcc/testsuite/gcc.target/arm/armv8-sync-comp-swap.c
+++ b/gcc/testsuite/gcc.target/arm/armv8-sync-comp-swap.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { do-require-effective-target arm_arch_v8a_ok } */
+/* { dg-require-effective-target arm_arch_v8a_ok } */
 /* { dg-options "-O2" } */
 /* { dg-add-options arm_arch_v8a } */
 
diff --git a/gcc/testsuite/gcc.target/arm/armv8-sync-op-acquire.c b/gcc/testsuite/gcc.target/arm/armv8-sync-op-acquire.c
index 8d6659b..c448599 100644
--- a/gcc/testsuite/gcc.target/arm/armv8-sync-op-acquire.c
+++ b/gcc/testsuite/gcc.target/arm/armv8-sync-op-acquire.c
@@ -1,10 +1,10 @@
 /* { dg-do compile } */
-/* { do-require-effective-target arm_arch_v8a_ok } */
+/* { dg-require-effective-target arm_arch_v8a_ok } */
 /* { dg-options "-O2" } */
 /* { dg-add-options arm_arch_v8a } */
 
 #include "../aarch64/sync-op-acquire.x"
 
 /* { dg-final { scan-assembler-times "ldrex" 1 } } */
-/* { dg-final { scan-assembler-times "stlex" 1 } } */
+/* { dg-final { scan-assembler-times "strex" 1 } } */
 /* { dg-final { scan-assembler-times "dmb" 1 } } */
diff --git a/gcc/testsuite/gcc.target/arm/armv8-sync-op-full.c b/gcc/testsuite/gcc.target/arm/armv8-sync-op-full.c
index a5ad3bd..cce9e00 100644
--- a/gcc/testsuite/gcc.target/arm/armv8-sync-op-full.c
+++ b/gcc/testsuite/gcc.target/arm/armv8-sync-op-full.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { do-require-effective-target arm_arch_v8a_ok } */
+/* { dg-require-effective-target arm_arch_v8a_ok } */
 /* { dg-options "-O2" } */
 /* { dg-add-options arm_arch_v8a } */
 
diff --git a/gcc/testsuite/gcc.target/arm/armv8-sync-op-release.c b/gcc/testsuite/gcc.target/arm/armv8-sync-op-release.c
index 0d3be7b..502a266 100644
--- a/gcc/testsuite/gcc.target/arm/armv8-sync-op-release.c
+++ b/gcc/testsuite/gcc.target/arm/armv8-sync-op-release.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { do-require-effective-target arm_arch_v8a_ok } */
+/* { dg-require-effective-target arm_arch_v8a_ok } */
 /* { dg-options "-O2" } */
 /* { dg-add-options arm_arch_v8a } */
 
-- 
1.9.1