Revert "elf: Remove bundled Guile source."

This reverts commit 11cf5b2fe4882f123cd5e9eb385a773703dfe872.

2 files changed, 8 insertions, 6 deletions

diff --git a/tests/debug-link.scm b/tests/debug-link.scm
index 1ba40cdd4fc..7ccc054a5d9 100644
--- a/tests/debug-link.scm
+++ b/tests/debug-link.scm
@@ -18,6 +18,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (test-debug-link)
+  #:use-module (guix elf)
   #:use-module (guix build utils)
   #:use-module (guix build debug-link)
   #:use-module (guix build io)
@@ -32,7 +33,6 @@
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
   #:use-module (srfi srfi-64)
-  #:use-module (system vm elf)
   #:use-module (rnrs io ports)
   #:use-module (ice-9 match))
 
@@ -69,12 +69,13 @@
              (exp  (with-imported-modules (source-module-closure
                                            '((guix build io)
                                              (guix build utils)
-                                             (guix build debug-link)))
+                                             (guix build debug-link)
+                                             (guix elf)))
                      #~(begin
                          (use-modules (guix build io)
                                       (guix build utils)
                                       (guix build debug-link)
-                                      (system vm elf)
+                                      (guix elf)
                                       (rnrs io ports))
 
                          (define read-elf
@@ -114,12 +115,13 @@
              (exp   (with-imported-modules (source-module-closure
                                             '((guix build io)
                                               (guix build utils)
-                                              (guix build debug-link)))
+                                              (guix build debug-link)
+                                              (guix elf)))
                       #~(begin
                           (use-modules (guix build io)
                                        (guix build utils)
                                        (guix build debug-link)
-                                       (system vm elf)
+                                       (guix elf)
                                        (rnrs io ports))
 
                           (define read-elf
diff --git a/tests/gremlin.scm b/tests/gremlin.scm
index 34cab5e5675..44237e2ad37 100644
--- a/tests/gremlin.scm
+++ b/tests/gremlin.scm
@@ -19,6 +19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (test-gremlin)
+  #:use-module (guix elf)
   #:use-module (guix tests)
   #:use-module ((guix utils) #:select (call-with-temporary-directory
                                        target-aarch64?))
@@ -30,7 +31,6 @@
   #:use-module (srfi srfi-26)
   #:use-module (srfi srfi-34)
   #:use-module (srfi srfi-64)
-  #:use-module (system vm elf)
   #:use-module (rnrs io ports)
   #:use-module (ice-9 popen)
   #:use-module (ice-9 rdelim)