[SCM] master: Avoid % rule, explicitly specify the target for libfrysk-sys-jni.so.

[cagney@sourceware.org]

The branch, master has been updated
       via  9147b4bdb1a382b221dcdc340365ebd3f411f694 (commit)
       via  bec4e629bf34a5ac515aaeb1fbabdc04c39f9f2b (commit)
      from  0e2c16ad37aefb00338a1e50800df5359982a74f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 9147b4bdb1a382b221dcdc340365ebd3f411f694
Author: Andrew Cagney <cagney@redhat.com>
Date:   Fri Jun 20 13:34:18 2008 -0400

    Avoid % rule, explicitly specify the target for libfrysk-sys-jni.so.
    
    There were two candidates for libfrysk-sys-jni.so: .a.so: and
    %-jni.so:%-jni.a, since make took either, just be explicit.
    
    frysk-common/ChangeLog
    2008-06-20  Andrew Cagney  <cagney@redhat.com>
    
    	* Makefile.rules (lib$(GEN_DIRNAME)-jni.so): Replace less explicit
    	%-jni.so target.

commit bec4e629bf34a5ac515aaeb1fbabdc04c39f9f2b
Author: Andrew Cagney <cagney@redhat.com>
Date:   Fri Jun 20 13:16:53 2008 -0400

    When logging an exception, include the inner most frame.
    
    frysk-sys/frysk/rsl/ChangeLog
    2008-06-20  Andrew Cagney  <cagney@redhat.com>
    
    	* Printer.java: Include the inner most stack frame when printing
    	exceptions.

-----------------------------------------------------------------------

Summary of changes:
 frysk-common/ChangeLog           |    3 +++
 frysk-common/Makefile.rules      |    3 ++-
 frysk-sys/frysk/rsl/ChangeLog    |    5 +++++
 frysk-sys/frysk/rsl/Printer.java |   20 ++++++++++++++++----
 4 files changed, 26 insertions(+), 5 deletions(-)

First 500 lines of diff:
diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog
index 266b0f2..10dc607 100644
--- a/frysk-common/ChangeLog
+++ b/frysk-common/ChangeLog
@@ -1,5 +1,8 @@
 2008-06-20  Andrew Cagney  <cagney@redhat.com>
 
+	* Makefile.rules (lib$(GEN_DIRNAME)-jni.so): Replace less explicit
+	%-jni.so target.
+	
 	* Makefile.rules (Runner): Delete LD_PRELOAD hack.
 
 2008-06-19  Andrew Cagney  <cagney@redhat.com>
diff --git a/frysk-common/Makefile.rules b/frysk-common/Makefile.rules
index 233bbde..c80b81c 100644
--- a/frysk-common/Makefile.rules
+++ b/frysk-common/Makefile.rules
@@ -473,7 +473,8 @@ JNI_LIBRARY_LIST =
 # A list of extra object files that should be added to the .so.
 JNI_OBJECT_LIST =
 
-%-jni.so: %-jni.a $(JNI_ARCHIVE_LIST) $(JNI_OBJECT_LIST)
+lib$(GEN_DIRNAME)-jni.so: $(JNI_ARCHIVE_LIST) $(JNI_OBJECT_LIST)
+lib$(GEN_DIRNAME)-jni.so: lib$(GEN_DIRNAME)-jni.a
 	soname=`basename $@` ; \
 	$(CC) -shared -o $@.tmp \
 		-Wl,--whole-archive \
diff --git a/frysk-sys/frysk/rsl/ChangeLog b/frysk-sys/frysk/rsl/ChangeLog
index a37407d..87484e4 100644
--- a/frysk-sys/frysk/rsl/ChangeLog
+++ b/frysk-sys/frysk/rsl/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-20  Andrew Cagney  <cagney@redhat.com>
+
+	* Printer.java: Include the inner most stack frame when printing
+	exceptions.
+
 2008-06-19  Andrew Cagney  <cagney@redhat.com>
 
 	* Log.java: Add more methods.
diff --git a/frysk-sys/frysk/rsl/Printer.java b/frysk-sys/frysk/rsl/Printer.java
index a8e926d..5ebec05 100644
--- a/frysk-sys/frysk/rsl/Printer.java
+++ b/frysk-sys/frysk/rsl/Printer.java
@@ -158,11 +158,23 @@ public final class Printer {
      */
     private void dump(Throwable t) {
 	out.print("<<exception ");
-	out.print(t.toString());
-	for (Throwable cause = t.getCause(); cause != null;
-	     cause = cause.getCause()) {
+	while (true) {
+	    out.print(t.toString());
+	    StackTraceElement[] stack = t.getStackTrace();
+	    for (int i = 0; i < stack.length; i++) {
+		if (i >= 1) {
+		    // XXX: the cap is some what arbitrary
+		    out.print(" ...");
+		    break;
+		} else {
+		    out.print(" <at> ");
+		    out.print(stack[i].toString());
+		}
+	    }
+	    t = t.getCause();
+	    if (t == null)
+		break;
 	    out.print(" <caused-by> ");
-	    out.print(cause.toString());
 	}
 	out.print(">>");
     }


hooks/post-receive
--
frysk system monitor/debugger