From e29b894bd74323d0d355c8607078326b5e79c11f Mon Sep 17 00:00:00 2001
From: Taylor R Campbell <campbell@mumble.net>
Date: Wed, 9 Jan 2019 03:48:12 +0000
Subject: [PATCH] Update liarc to modern debugging info/wrapper formats.

---
 src/compiler/machines/C/ctop.scm | 38 +++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/compiler/machines/C/ctop.scm b/src/compiler/machines/C/ctop.scm
index fae70e10f..a8be8a328 100644
--- a/src/compiler/machines/C/ctop.scm
+++ b/src/compiler/machines/C/ctop.scm
@@ -344,12 +344,27 @@ USA.
 	    (last-reference *start-label*)
 	    (last-reference *lap*)
 	    (cond ((eq? pathname 'RECURSIVE)
-		   (cons *info-output-filename*
-			 *recursive-compilation-number*))
+		   (vector 'debugging-info-wrapper
+			   3
+			   *debugging-key*
+			   (if (pathname? *info-output-filename*)
+			       (->namestring *info-output-filename*)
+			       *info-output-filename*)
+			   *recursive-compilation-number*
+			   #f
+			   *library-name*))
 		  ((eq? pathname 'KEEP)
 		   #f)
 		  (else
-		   pathname))))
+		   (vector 'debugging-info-wrapper
+			   3
+			   *debugging-key*
+			   (if (pathname? *info-output-filename*)
+			       (->namestring *info-output-filename*)
+			       *info-output-filename*)
+			   0
+			   #f
+			   *library-name*)))))
        (lambda (code-name data-name ntags labels code proxy)
 	 (set! *C-code-name* code-name)
 	 (set! *C-data-name* data-name)
@@ -431,13 +446,16 @@ USA.
 			   *recursive-compilation-results*))
 	       #f)
 	      (else
-	       (let ((others (recursive-compilation-results)))
-		 (if (null? others)
-		     info
-		     (list->vector
-		      (cons info
-			    (map (lambda (other) (vector-ref other 1))
-				 others)))))))))))
+	       (vector 'debugging-file-wrapper
+		       3
+		       *debugging-key*
+		       (list->vector
+			(cons
+			 info
+			 (map (lambda (other)
+				(vector-ref other 1))
+			      (recursive-compilation-results))))
+		       *library-name*)))))))
 
 (define (compiler:dump-bci-file binf pathname)
   (dump-compressed binf (pathname-new-type pathname "bci")))
-- 
2.25.1