diff options
author | Andy Wingo <wingo@pobox.com> | 2013-06-10 22:42:46 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-06-10 22:42:46 +0200 |
commit | 4828538940e6fcd1637f359fa5557acb4b6e9c91 (patch) | |
tree | 79ff91a55f6f88c289d036c2465615e1b064e1a4 | |
parent | c4c098e355bd2edcd3bc66eb7041c5f9cdeefef0 (diff) | |
download | guile-4828538940e6fcd1637f359fa5557acb4b6e9c91.tar.gz |
fix linker.test
* test-suite/tests/linker.test (link-elf-with-one-main-section): Fix
test after string table change.
-rw-r--r-- | test-suite/tests/linker.test | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/test-suite/tests/linker.test b/test-suite/tests/linker.test index 9e63991b0..dcfac1b81 100644 --- a/test-suite/tests/linker.test +++ b/test-suite/tests/linker.test @@ -24,15 +24,9 @@ #:use-module (system vm linker)) (define (link-elf-with-one-main-section name bytes) - (let ((string-table (make-string-table))) - (define (intern-string! string) - (call-with-values - (lambda () (string-table-intern string-table string)) - (lambda (table idx) - (set! string-table table) - idx))) + (let ((strtab (make-string-table))) (define (make-object index name bv relocs . kwargs) - (let ((name-idx (intern-string! (symbol->string name)))) + (let ((name-idx (string-table-intern! strtab (symbol->string name)))) (make-linker-object (apply make-elf-section #:index index #:name name-idx @@ -40,16 +34,16 @@ kwargs) bv relocs (list (make-linker-symbol name 0))))) - (define (make-string-table) - (intern-string! ".shstrtab") - (make-object 2 '.shstrtab (link-string-table string-table) '() + (define (make-shstrtab) + (string-table-intern! strtab ".shstrtab") + (make-object 2 '.shstrtab (link-string-table! strtab) '() #:type SHT_STRTAB #:flags 0)) (let* ((word-size (target-word-size)) (endianness (target-endianness)) (sec (make-object 1 name bytes '())) ;; This needs to be linked last, because linking other ;; sections adds entries to the string table. - (shstrtab (make-string-table))) + (shstrtab (make-shstrtab))) (link-elf (list sec shstrtab) #:endianness endianness #:word-size word-size)))) |