From 55daf96ba75294ade668455a96fdb0e73a5dad25 Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Sun, 14 Mar 2004 20:10:56 +0000
Subject: [PATCH]   * disable some debuginfo info when valgrind support is used

---
 compiler/aasmtai.pas |  9 +++++++--
 compiler/ncgcal.pas  | 11 ++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/compiler/aasmtai.pas b/compiler/aasmtai.pas
index f93be5da52..3753333407 100644
--- a/compiler/aasmtai.pas
+++ b/compiler/aasmtai.pas
@@ -676,7 +676,9 @@ implementation
     constructor tailineinfo.create;
      begin
        inherited create;
-       fileinfo:=aktfilepos;
+       if (not inlining_procedure) and
+          (cs_gdb_valgrind in aktglobalswitches) then
+         fileinfo:=aktfilepos;
      end;
 
 
@@ -2000,7 +2002,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.76  2004-03-02 17:32:12  florian
+  Revision 1.77  2004-03-14 20:10:56  peter
+    * disable some debuginfo info when valgrind support is used
+
+  Revision 1.76  2004/03/02 17:32:12  florian
     * make cycle fixed
     + pic support for darwin
     + support of importing vars from shared libs on darwin implemented
diff --git a/compiler/ncgcal.pas b/compiler/ncgcal.pas
index 59b865e58f..42d62e8e24 100644
--- a/compiler/ncgcal.pas
+++ b/compiler/ncgcal.pas
@@ -1134,7 +1134,8 @@ implementation
          inlineexitcode:=TAAsmoutput.Create;
 
 {$ifdef GDB}
-         if (cs_debuginfo in aktmoduleswitches) then
+         if (cs_debuginfo in aktmoduleswitches) and
+            not(cs_gdb_valgrind in aktglobalswitches) then
            begin
              objectlibrary.getaddrlabel(startlabel);
              objectlibrary.getaddrlabel(endlabel);
@@ -1227,7 +1228,8 @@ implementation
            gen_free_localst(exprasmlist,tlocalsymtable(current_procinfo.procdef.localst));
 
 {$ifdef GDB}
-         if (cs_debuginfo in aktmoduleswitches) then
+         if (cs_debuginfo in aktmoduleswitches) and
+            not(cs_gdb_valgrind in aktglobalswitches) then
            begin
              cg.a_label(exprasmlist,endlabel);
              strpcopy(pp,'224,0,0,'+endlabel.name);
@@ -1264,7 +1266,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.163  2004-03-13 21:23:21  florian
+  Revision 1.164  2004-03-14 20:10:56  peter
+    * disable some debuginfo info when valgrind support is used
+
+  Revision 1.163  2004/03/13 21:23:21  florian
     * fixed inlining on arm
 
   Revision 1.162  2004/03/09 16:28:31  peter