From: Peter Johnson <peter@tortall.net>
Date: Sun, 12 Feb 2006 02:10:17 +0000 (-0000)
Subject: Merge [1380] from trunk.
X-Git-Tag: v0.5.0rc1~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d5e198b65ca38226ce6cd22d27d13828c4f9974;p=yasm

Merge [1380] from trunk.

svn path=/branches/yasm-0.5.x/; revision=1381
---

diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index 8d64f449..78fb39a5 100644
--- a/Mkfiles/Makefile.dj
+++ b/Mkfiles/Makefile.dj
@@ -59,7 +59,10 @@ MODULES_ARCH_OBJS= \
 MODULES_DBGFMTS_OBJS= \
  modules/dbgfmts/null/null-dbgfmt.o \
  modules/dbgfmts/stabs/stabs-dbgfmt.o \
- modules/dbgfmts/dwarf2/dwarf2-dbgfmt.o
+ modules/dbgfmts/dwarf2/dwarf2-dbgfmt.o \
+ modules/dbgfmts/dwarf2/dwarf2-line.o \
+ modules/dbgfmts/dwarf2/dwarf2-info.o \
+ modules/dbgfmts/dwarf2/dwarf2-aranges.o
 YASM_MODULES+=dbgfmt_null
 YASM_MODULES+=dbgfmt_stabs
 YASM_MODULES+=dbgfmt_dwarf2
diff --git a/Mkfiles/Makefile.flat b/Mkfiles/Makefile.flat
index f5da30ce..5dc40971 100644
--- a/Mkfiles/Makefile.flat
+++ b/Mkfiles/Makefile.flat
@@ -62,7 +62,10 @@ MODULES_ARCH_OBJS= \
 MODULES_DBGFMTS_OBJS= \
  modules/dbgfmts/null/null-dbgfmt.o \
  modules/dbgfmts/stabs/stabs-dbgfmt.o \
- modules/dbgfmts/dwarf2/dwarf2-dbgfmt.o
+ modules/dbgfmts/dwarf2/dwarf2-dbgfmt.o \
+ modules/dbgfmts/dwarf2/dwarf2-line.o \
+ modules/dbgfmts/dwarf2/dwarf2-info.o \
+ modules/dbgfmts/dwarf2/dwarf2-aranges.o
 YASM_MODULES+=dbgfmt_null
 YASM_MODULES+=dbgfmt_stabs
 YASM_MODULES+=dbgfmt_dwarf2
diff --git a/Mkfiles/vc/modules/modules.vcproj b/Mkfiles/vc/modules/modules.vcproj
index ae01e408..06b9c79f 100644
--- a/Mkfiles/vc/modules/modules.vcproj
+++ b/Mkfiles/vc/modules/modules.vcproj
@@ -298,9 +298,21 @@
 				<File
 					RelativePath="..\..\..\modules\dbgfmts\stabs\stabs-dbgfmt.c">
 				</File>
+				<File
+					RelativePath="..\..\..\modules\dbgfmts\dwarf2\dwarf2-dbgfmt.h">
+				</File>
 				<File
 					RelativePath="..\..\..\modules\dbgfmts\dwarf2\dwarf2-dbgfmt.c">
 				</File>
+				<File
+					RelativePath="..\..\..\modules\dbgfmts\dwarf2\dwarf2-line.c">
+				</File>
+				<File
+					RelativePath="..\..\..\modules\dbgfmts\dwarf2\dwarf2-info.c">
+				</File>
+				<File
+					RelativePath="..\..\..\modules\dbgfmts\dwarf2\dwarf2-aranges.c">
+				</File>
 			</Filter>
 			<Filter
 				Name="objfmts"
diff --git a/Mkfiles/vc8/modules/modules.vcproj b/Mkfiles/vc8/modules/modules.vcproj
index e80de964..0f4fe881 100644
--- a/Mkfiles/vc8/modules/modules.vcproj
+++ b/Mkfiles/vc8/modules/modules.vcproj
@@ -629,10 +629,26 @@
 					RelativePath="..\..\..\modules\dbgfmts\stabs\stabs-dbgfmt.c"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\modules\dbgfmts\dwarf2\dwarf2-dbgfmt.h"
+					>
+				</File>
 				<File
 					RelativePath="..\..\..\modules\dbgfmts\dwarf2\dwarf2-dbgfmt.c"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\modules\dbgfmts\dwarf2\dwarf2-line.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\modules\dbgfmts\dwarf2\dwarf2-info.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\modules\dbgfmts\dwarf2\dwarf2-aranges.c"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="objfmts"