From ae0bef88fde4a7e705c9b1fce2477b9867207ce4 Mon Sep 17 00:00:00 2001
From: Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
Date: Fri, 19 Mar 2010 16:02:49 +0000
Subject: [PATCH] Revert work around for PR40521

2010-03-19  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>

        Revert
        2009-10-01  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
        * config/arm/arm.c (arm_override_options): Turn off
        flag_dwarf2_cfi_asm for AAPCS variants.

From-SVN: r157575
---
 gcc/ChangeLog        | 8 ++++++++
 gcc/config/arm/arm.c | 7 -------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2c449aaf7dc6..d5f0aaf4387b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-19  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
+
+	Revert
+	2009-10-01  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
+
+	* config/arm/arm.c (arm_override_options): Turn off
+	flag_dwarf2_cfi_asm for AAPCS variants.
+
 2010-03-19  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
 
 	PR target/43399
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 864d3aff56b5..870e56ed85ed 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -1877,13 +1877,6 @@ arm_override_options (void)
       flag_reorder_blocks = 1;
     }
 
-  /* Ideally we would want to use CFI directives to generate
-     debug info.  However this also creates the .eh_frame
-     section, so disable them until GAS can handle
-     this properly.  See PR40521. */
-  if (TARGET_AAPCS_BASED)
-    flag_dwarf2_cfi_asm = 0;
-
   /* Register global variables with the garbage collector.  */
   arm_add_gc_roots ();
 }
-- 
GitLab