From: Jan Beulich <jbeulich@novell.com>
Date: Wed, 26 Sep 2007 07:02:07 +0000 (+0000)
Subject: gas/
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0a7b15ff9a901c96669d1efe7f68b19efc061013;p=binutils-gdb.git

gas/
2007-09-26  Jan Beulich  <jbeulich@novell.com>

	* dw2gencfi.c: Conditionalize whole body upon TARGET_USE_CFIPOP.
	(cfi_finish): Add second empty instance.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0b5829fdb59..6a9bb540232 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-26  Jan Beulich  <jbeulich@novell.com>
+
+	* dw2gencfi.c: Conditionalize whole body upon TARGET_USE_CFIPOP.
+	(cfi_finish): Add second empty instance.
+
 2007-09-26  Jan Beulich  <jbeulich@novell.com>
 
 	* config/tc-ia64.c (dot_pred_rel): Replace specialized handling
diff --git a/gas/dw2gencfi.c b/gas/dw2gencfi.c
index fb7daea60b1..1e8262bd454 100644
--- a/gas/dw2gencfi.c
+++ b/gas/dw2gencfi.c
@@ -23,6 +23,7 @@
 #include "dw2gencfi.h"
 #include "subsegs.h"
 
+#ifdef TARGET_USE_CFIPOP
 
 /* We re-use DWARF2_LINE_MIN_INSN_LENGTH for the code alignment field
    of the CIE.  Default to 1 if not otherwise specified.  */
@@ -30,18 +31,6 @@
 # define DWARF2_LINE_MIN_INSN_LENGTH 1
 #endif
 
-/* If TARGET_USE_CFIPOP is defined, it is required that the target
-   provide the following definitions.  Otherwise provide them to 
-   allow compilation to continue.  */
-#ifndef TARGET_USE_CFIPOP
-# ifndef  DWARF2_DEFAULT_RETURN_COLUMN
-#  define DWARF2_DEFAULT_RETURN_COLUMN 0
-# endif
-# ifndef  DWARF2_CIE_DATA_ALIGNMENT
-#  define DWARF2_CIE_DATA_ALIGNMENT 1
-# endif
-#endif
-
 #ifndef EH_FRAME_ALIGNMENT
 # define EH_FRAME_ALIGNMENT (bfd_get_arch_size (stdoutput) == 64 ? 3 : 2)
 #endif
@@ -1346,3 +1335,10 @@ cfi_finish (void)
 
   flag_traditional_format = save_flag_traditional_format;
 }
+
+#else /* TARGET_USE_CFIPOP */
+void
+cfi_finish (void)
+{
+}
+#endif /* TARGET_USE_CFIPOP */