From c095a3586a604bb6231133e8df41c07a7c352dc5 Mon Sep 17 00:00:00 2001
From: Kyrylo Tkachov <kyrylo.tkachov@arm.com>
Date: Fri, 2 Oct 2015 12:57:21 +0000
Subject: [PATCH] [ARM] Fix 4.9 backport of "armv8 linux toolchain asan
 testcase fail due to stl missing conditional code"

	* sync.md (atomic_load<mode>): Fix output modifier for lda.
	(atomic_store<mode>): Likewise for stl.

From-SVN: r228389
---
 gcc/ChangeLog          | 5 +++++
 gcc/config/arm/sync.md | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ce46cecd6c8c..8060d4bb69e0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-02  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+	* sync.md (atomic_load<mode>): Fix output modifier for lda.
+	(atomic_store<mode>): Likewise for stl.
+
 2015-10-01  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
 	Backport from mainline
diff --git a/gcc/config/arm/sync.md b/gcc/config/arm/sync.md
index 747fc7ee390e..25ed926fc4e7 100644
--- a/gcc/config/arm/sync.md
+++ b/gcc/config/arm/sync.md
@@ -79,7 +79,7 @@
         || model == MEMMODEL_RELEASE)
       return \"ldr%(<sync_sfx>%)\\t%0, %1\";
     else
-      return \"lda%(<sync_sfx>%)\\t%0, %1\";
+      return \"lda<sync_sfx>%?\\t%0, %1\";
   }
   [(set_attr "predicable" "yes")
    (set_attr "predicable_short_it" "no")])
@@ -98,7 +98,7 @@
         || model == MEMMODEL_ACQUIRE)
       return \"str%(<sync_sfx>%)\t%1, %0\";
     else
-      return \"stl%(<sync_sfx>%)\t%1, %0\";
+      return \"stl<sync_sfx>%?\t%1, %0\";
   }
   [(set_attr "predicable" "yes")
    (set_attr "predicable_short_it" "no")])
-- 
2.47.2