(DWARF_VERSION): Define as 1 if not already defined.

From-SVN: r12770

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 1bda04ec0b0d1645b6694da41f31d5ad6e8412d4..27cd20649badb5cc0a288770a70300c1c3f035d6 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -21,8 +21,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "config.h"
 
-#if defined(DWARF_DEBUGGING_INFO) && defined(DWARF_VERSION) \
-    && DWARF_VERSION == 2
+#ifndef DWARF_VERSION
+#define DWARF_VERSION 1
+#endif
+#if defined (DWARF_DEBUGGING_INFO) && (DWARF_VERSION == 2)
 #include <stdio.h>
 #include "dwarf2.h"
 #include "tree.h"

diff --git a/gcc/dwarfout.c b/gcc/dwarfout.c
index a677698f1ac66a5713deb07efee98e8650f8fa2b..300badea2c8aef27d1026347a8cd39b022a2140a 100644 (file)
--- a/gcc/dwarfout.c
+++ b/gcc/dwarfout.c
@@ -21,8 +21,10 @@ Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
 
-#if defined (DWARF_DEBUGGING_INFO) && (! defined (DWARF_VERSION) \
-                                      || DWARF_VERSION != 2)
+#ifndef DWARF_VERSION
+#define DWARF_VERSION 1
+#endif
+#if defined (DWARF_DEBUGGING_INFO) && (DWARF_VERSION != 2)
 #include <stdio.h>
 #include "dwarf.h"
 #include "tree.h"
@@ -34,10 +36,6 @@ Boston, MA 02111-1307, USA.  */
 #include "output.h"
 #include "defaults.h"
 
-#ifndef DWARF_VERSION
-#define DWARF_VERSION 1
-#endif
-
 /* #define NDEBUG 1 */
 #include "assert.h"
 
@@ -5732,4 +5730,4 @@ dwarfout_finish ()
     }
 }
 
-#endif /* DWARF_DEBUGGING_INFO */
+#endif /* DWARF_DEBUGGING_INFO && DWARF_VERSION != 2 */