From: Olivier Hainque <hainque@adacore.com>
Date: Sun, 8 Oct 2017 08:10:41 +0000 (+0000)
Subject: arm-common.c (arm_except_unwind_info): Handle DWARF2_UNWIND_INFO.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=221ebb39af8e3c015a2aed2fa6e6001669cf9e29;p=gcc.git

arm-common.c (arm_except_unwind_info): Handle DWARF2_UNWIND_INFO.

2017-10-08  Olivier Hainque  <hainque@adacore.com>

        * common/config/arm/arm-common.c (arm_except_unwind_info):
        Handle DWARF2_UNWIND_INFO.

From-SVN: r253521
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f1c391bc99e..b44775caff2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-08  Olivier Hainque  <hainque@adacore.com>
+
+	* common/config/arm/arm-common.c (arm_except_unwind_info):
+	Handle DWARF2_UNWIND_INFO.
+
 2017-10-07  Michael Collison <michael.collison@arm.com>
 
 	* config/aarch64/aarch64.md (*aarch64_reg_<optab>_minus<mode>3):
diff --git a/gcc/common/config/arm/arm-common.c b/gcc/common/config/arm/arm-common.c
index 7cb99ece710..1588ca86e9b 100644
--- a/gcc/common/config/arm/arm-common.c
+++ b/gcc/common/config/arm/arm-common.c
@@ -63,7 +63,13 @@ arm_except_unwind_info (struct gcc_options *opts)
 	return UI_TARGET;
     }
 
-  /* ... we use sjlj exceptions for backwards compatibility.  */
+  /* ... honor target configurations requesting DWARF2 EH...  */
+#ifdef DWARF2_UNWIND_INFO
+  if (DWARF2_UNWIND_INFO)
+    return UI_DWARF2;
+#endif
+
+  /* ... or fallback to sjlj exceptions for backwards compatibility.  */
   return UI_SJLJ;
 }