Re: Enable testGetLine except X86_64

[Mark Wielaard <mark at klomp dot org>]

On Tue, 2006-09-19 at 14:07 +0200, Mark Wielaard wrote:
> I simplified the testcase a little so all architectures should report
> the same line number as follows:
> 
> 2006-09-19  Mark Wielaard  <mark@klomp.org>
> 
>     * tests/cni/TestLib.cxx (getFuncAddr): Extract define out of
>     function and put whole definition on one line.
>     * tests/TestDwfl.java (testGetLine): Use same line number for all
>     architectures.

Oops, forgot to attach the interesting part of the patch.

Index: frysk-imports/lib/dw/tests/cni/TestLib.cxx
===================================================================
RCS file: /cvs/frysk/frysk-imports/lib/dw/tests/cni/TestLib.cxx,v
retrieving revision 1.3
diff -u -r1.3 TestLib.cxx
--- frysk-imports/lib/dw/tests/cni/TestLib.cxx  7 Aug 2006 13:25:26 -0000      1.3
+++ frysk-imports/lib/dw/tests/cni/TestLib.cxx  19 Sep 2006 11:58:35 -0000
@@ -47,11 +47,12 @@
   return (jint) getpid();
 }

-jlong
-lib::dw::tests::TestLib::getFuncAddr(){
 #ifdef __powerpc64__
-  return *((jlong*) &getFuncAddr);
+  #define FUNC_ADDR *((jlong*) &getFuncAddr)
 #else
-  return (jlong) &getFuncAddr;
+  #define FUNC_ADDR (jlong) &getFuncAddr;
 #endif
-}
+
+// All one one line to make debug line number info predictable
+// Next line is line #58
+jlong lib::dw::tests::TestLib::getFuncAddr(){ return FUNC_ADDR; }