diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 12fc17fdc20..b568f370392 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-07  Douglas B Rupp  <rupp@adacore.com>
+
+	PR target/60504
+	* config/arm/arm.h (ASM_PREFERRED_EH_DATA_FORMAT): Expose from
+	ARM_TARGET2_DWARF_FORMAT.
+
 2014-04-07  Charles Baylis  <charles.baylis@linaro.org>
 
 	PR target/60609
@@ -8,10 +14,8 @@
 2014-04-07  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/60766
-	* tree-ssa-loop-ivopts.c (cand_value_at): Compute in an
-	unsigned type.
-	(may_eliminate_iv): Convert cand_value_at result to desired
-	type.
+	* tree-ssa-loop-ivopts.c (cand_value_at): Compute in an unsigned type.
+	(may_eliminate_iv): Convert cand_value_at result to desired type.
 
 2014-04-07  Jason Merrill  <jason@redhat.com>
 
diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index a4bbd12c2a0..597e69c6e03 100644
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -937,13 +937,13 @@ extern int arm_arch_crc;
 
 #ifndef ARM_TARGET2_DWARF_FORMAT
 #define ARM_TARGET2_DWARF_FORMAT DW_EH_PE_pcrel
+#endif
 
 /* ttype entries (the only interesting data references used)
    use TARGET2 relocations.  */
 #define ASM_PREFERRED_EH_DATA_FORMAT(code, data) \
   (((code) == 0 && (data) == 1 && ARM_UNWIND_INFO) ? ARM_TARGET2_DWARF_FORMAT \
 			       : DW_EH_PE_absptr)
-#endif
 
 /* The native (Norcroft) Pascal compiler for the ARM passes the static chain
    as an invisible last argument (possible since varargs don't exist in
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cd07b283e3c..16f23c570e6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-07  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/test_raise_from_pure.adb: UnXFAIL for ARM.
+
 2014-04-07  Charles Baylis  <charles.baylis@linaro.org>
 
 	PR target/60609
diff --git a/gcc/testsuite/gnat.dg/test_raise_from_pure.adb b/gcc/testsuite/gnat.dg/test_raise_from_pure.adb
index 66db2232e77..8f928c58584 100644
--- a/gcc/testsuite/gnat.dg/test_raise_from_pure.adb
+++ b/gcc/testsuite/gnat.dg/test_raise_from_pure.adb
@@ -1,4 +1,4 @@
--- { dg-do run { xfail arm*-*-* } }
+-- { dg-do run }
 -- { dg-options "-O2" }
 
 -- This is an optimization test and its failure is only a missed optimization.