diff options
author | Andy Wingo <wingo@pobox.com> | 2013-11-19 20:02:15 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-11-19 20:02:15 +0100 |
commit | 8bf83893c746326dd1f10f1381423bd0406cf58c (patch) | |
tree | 1bb53a9efb8fdaaef0b0682a4659baddd7dae329 | |
parent | 6b9470bf483e14e10ae85fc6bcbc25b4e2e77ff7 (diff) | |
download | guile-8bf83893c746326dd1f10f1381423bd0406cf58c.tar.gz |
Rename DT_GUILE_VM_VERSION.
* libguile/objcodes.c (DT_GUILE_VM_VERSION, process_dynamic_segment):
* module/system/vm/elf.scm (DT_GUILE_VM_VERSION): Rename from
DT_GUILE_RTL_VERSION.
* module/system/vm/assembler.scm (link-dynamic-section): Adapt.
-rw-r--r-- | libguile/objcodes.c | 8 | ||||
-rw-r--r-- | module/system/vm/assembler.scm | 2 | ||||
-rw-r--r-- | module/system/vm/elf.scm | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/libguile/objcodes.c b/libguile/objcodes.c index 14ed564df..52ba7b809 100644 --- a/libguile/objcodes.c +++ b/libguile/objcodes.c @@ -68,7 +68,7 @@ #define DT_GUILE_GC_ROOT_SZ 0x37146001 /* Size in machine words of GC roots */ #define DT_GUILE_ENTRY 0x37146002 /* Address of entry thunk */ -#define DT_GUILE_RTL_VERSION 0x37146003 /* Bytecode version */ +#define DT_GUILE_VM_VERSION 0x37146003 /* Bytecode version */ #define DT_HIGUILE 0x37146fff /* End of Guile-specific */ #ifdef WORDS_BIGENDIAN @@ -280,9 +280,9 @@ process_dynamic_segment (char *base, Elf_Phdr *dyn_phdr, return "duplicate DT_GUILE_ENTRY"; entry = base + dyn[i].d_un.d_val; break; - case DT_GUILE_RTL_VERSION: + case DT_GUILE_VM_VERSION: if (bytecode_kind != BYTECODE_KIND_NONE) - return "duplicate DT_GUILE_RTL_VERSION"; + return "duplicate DT_GUILE_VM_VERSION"; { scm_t_uint16 major = dyn[i].d_un.d_val >> 16; scm_t_uint16 minor = dyn[i].d_un.d_val & 0xffff; @@ -319,7 +319,7 @@ process_dynamic_segment (char *base, Elf_Phdr *dyn_phdr, break; case BYTECODE_KIND_NONE: default: - return "missing DT_GUILE_RTL_VERSION"; + return "missing DT_GUILE_VM_VERSION"; } if (gc_root) diff --git a/module/system/vm/assembler.scm b/module/system/vm/assembler.scm index fd99179d4..7c1d58982 100644 --- a/module/system/vm/assembler.scm +++ b/module/system/vm/assembler.scm @@ -1220,7 +1220,7 @@ it will be added to the GC roots at runtime." (* i word-size) 0 label) relocs)) (%set-uword! bv (* i word-size) 0 endianness)))) - (set-uword! 0 DT_GUILE_RTL_VERSION) + (set-uword! 0 DT_GUILE_VM_VERSION) (set-uword! 1 (logior (ash *bytecode-major-version* 16) *bytecode-minor-version*)) (set-uword! 2 DT_GUILE_ENTRY) diff --git a/module/system/vm/elf.scm b/module/system/vm/elf.scm index 516745913..2fe99bada 100644 --- a/module/system/vm/elf.scm +++ b/module/system/vm/elf.scm @@ -105,7 +105,7 @@ DT_FINI_ARRAYSZ DT_RUNPATH DT_FLAGS DT_ENCODING DT_PREINIT_ARRAY DT_PREINIT_ARRAYSZ DT_NUM DT_LOGUILE DT_GUILE_GC_ROOT DT_GUILE_GC_ROOT_SZ DT_GUILE_ENTRY - DT_GUILE_RTL_VERSION DT_HIGUILE DT_LOOS DT_HIOS DT_LOPROC + DT_GUILE_VM_VERSION DT_HIGUILE DT_LOOS DT_HIOS DT_LOPROC DT_HIPROC string-table-ref @@ -780,7 +780,7 @@ (define DT_GUILE_GC_ROOT #x37146000) ; Offset of GC roots (define DT_GUILE_GC_ROOT_SZ #x37146001) ; Size in machine words of GC roots (define DT_GUILE_ENTRY #x37146002) ; Address of entry thunk -(define DT_GUILE_RTL_VERSION #x37146003); Bytecode version +(define DT_GUILE_VM_VERSION #x37146003) ; Bytecode version (define DT_HIGUILE #x37146fff) ; End of Guile-specific (define DT_LOOS #x6000000d) ; Start of OS-specific (define DT_HIOS #x6ffff000) ; End of OS-specific |