aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/common/config/arm/arm-common.c8
2 files changed, 12 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f1c391b..b44775c 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 7cb99ec..1588ca8 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;
}