From f1999a6643db296882aed956a3b6645550acd42d Mon Sep 17 00:00:00 2001
From: Christian Bruel <christian.bruel@st.com>
Date: Tue, 7 Jul 2015 09:56:10 +0200
Subject: [PATCH] Cleanup arch file directive.

PR target/52144
* config/arm/elf.h (TARGET_ASM_FILE_START_APP_OFF): Delete.

PR target/52144
* gcc.target/arm/flip-thumb.c: Fix scan.
* gcc.target/arm/attr_thumb.c: Test for all targets. Fix scan.
* gcc.target/arm/attr_arm.c: Test for all targets. Fix scan.
* gcc.target/arm/attr_thumb-static.c: Test for all targets.
Fix return value.

From-SVN: r225503
---
 gcc/ChangeLog                                    | 5 +++++
 gcc/config/arm/elf.h                             | 1 -
 gcc/testsuite/ChangeLog                          | 9 +++++++++
 gcc/testsuite/gcc.target/arm/attr_arm.c          | 6 ++----
 gcc/testsuite/gcc.target/arm/attr_thumb-static.c | 5 +++--
 gcc/testsuite/gcc.target/arm/attr_thumb.c        | 6 +++---
 gcc/testsuite/gcc.target/arm/flip-thumb.c        | 4 ++--
 7 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c0500c25b82..d136ee1722a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-07  Christian Bruel  <christian.bruel@st.com>
+
+	PR target/52144
+	* config/arm/elf.h (TARGET_ASM_FILE_START_APP_OFF): Delete.
+
 2015-07-07  Richard Biener  <rguenther@suse.de>
 
 	PR middle-end/66739
diff --git a/gcc/config/arm/elf.h b/gcc/config/arm/elf.h
index c56bbdff694..3795728ca90 100644
--- a/gcc/config/arm/elf.h
+++ b/gcc/config/arm/elf.h
@@ -120,7 +120,6 @@
   { "marm", "mlittle-endian", "mfloat-abi=soft", "mno-thumb-interwork", "fno-leading-underscore" }
 #endif
 
-#define TARGET_ASM_FILE_START_APP_OFF true
 #define TARGET_ASM_FILE_START_FILE_DIRECTIVE true
 
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0788e3cbfd1..a398b6f467f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2015-07-07  Christian Bruel  <christian.bruel@st.com>
+
+	PR target/52144
+	* gcc.target/arm/flip-thumb.c: Fix scan.
+	* gcc.target/arm/attr_thumb.c: Test for all targets. Fix scan.
+	* gcc.target/arm/attr_arm.c: Test for all targets. Fix scan.
+	* gcc.target/arm/attr_thumb-static.c: Test for all targets.
+	Fix return value.
+
 2015-05-05  Jakub Jelinek  <jakub@redhat.com>
 
         PR target/65956
diff --git a/gcc/testsuite/gcc.target/arm/attr_arm.c b/gcc/testsuite/gcc.target/arm/attr_arm.c
index 0fca19b27d1..f5c70ef690f 100644
--- a/gcc/testsuite/gcc.target/arm/attr_arm.c
+++ b/gcc/testsuite/gcc.target/arm/attr_arm.c
@@ -1,9 +1,7 @@
 /* Check that attribute target arm is recognized.  */
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arm_ok } */
-/* { dg-options "-O2" } */
-/* { dg-final { scan-assembler ".arm" } } */
-/* { dg-final { scan-assembler-not "ite" } } */
+/* { dg-final { scan-assembler "\\.arm" } } */
+/* { dg-final { scan-assembler-not "\\.thumb_func" } } */
 
 int __attribute__((target("arm")))
 foo(int a)
diff --git a/gcc/testsuite/gcc.target/arm/attr_thumb-static.c b/gcc/testsuite/gcc.target/arm/attr_thumb-static.c
index 8dc6451e025..1ce566f1c15 100644
--- a/gcc/testsuite/gcc.target/arm/attr_thumb-static.c
+++ b/gcc/testsuite/gcc.target/arm/attr_thumb-static.c
@@ -1,6 +1,5 @@
 /* Check that a change mode to a static function is correctly handled. */
 /* { dg-do run } */
-/* { dg-require-effective-target arm_thumb1_ok } */
 
 static void
  __attribute__((__noinline__)) 
@@ -17,8 +16,10 @@ bar (void)
   __asm__ ("");
 }
 
-int main()
+int
+main (void)
 {
   foo();
   bar();
+  return 0;
 }
diff --git a/gcc/testsuite/gcc.target/arm/attr_thumb.c b/gcc/testsuite/gcc.target/arm/attr_thumb.c
index 9701ab9f96f..02ddfdac6c3 100644
--- a/gcc/testsuite/gcc.target/arm/attr_thumb.c
+++ b/gcc/testsuite/gcc.target/arm/attr_thumb.c
@@ -1,13 +1,13 @@
 /* Check that attribute target thumb is recognized. */
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_thumb2_ok } */
 /* { dg-options "-O2 -mno-restrict-it" } */
-/* { dg-final { scan-assembler ".thumb" } } */
-/* { dg-final { scan-assembler "ite" } } */
+/* { dg-final { scan-assembler-not "\\.arm"  } } */
+/* { dg-final { scan-assembler "\\.thumb_func" } } */
 
 int __attribute__((target("thumb")))
 foo(int a)
 {
+  /* { dg-final { scan-assembler "ite" { target { arm_thumb2_ok } } } } */
   return a ? 1 : 5;
 }
 
diff --git a/gcc/testsuite/gcc.target/arm/flip-thumb.c b/gcc/testsuite/gcc.target/arm/flip-thumb.c
index 05f6bb7b423..91547999427 100644
--- a/gcc/testsuite/gcc.target/arm/flip-thumb.c
+++ b/gcc/testsuite/gcc.target/arm/flip-thumb.c
@@ -1,8 +1,8 @@
 /* Check -mflip-thumb. */
 /* { dg-do compile } */
 /* { dg-options "-O2 -mflip-thumb -mno-restrict-it" } */
-/* { dg-final { scan-assembler ".arm" } } */
-/* { dg-final { scan-assembler-times ".thumb_func" 1} } */
+/* { dg-final { scan-assembler "\\.arm" } } */
+/* { dg-final { scan-assembler-times "\\.thumb_func" 1} } */
 
 int 
 foo(int a)
-- 
2.30.2