# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1605871609 0
# Node ID d964f766faa52700c65dfa0fbdf4c3c7ee88f779
# Parent  84337bb7d84977059f046922660964af1b4e805c
linld: fix isoboot/cpuhaslm

diff -r 84337bb7d849 -r d964f766faa5 linld/stuff/src/ISOCRTL.ASM
--- a/linld/stuff/src/ISOCRTL.ASM	Wed Nov 18 09:50:51 2020 +0000
+++ b/linld/stuff/src/ISOCRTL.ASM	Fri Nov 20 11:26:49 2020 +0000
@@ -46,17 +46,17 @@
 		mov	di,128h		; TABLE
 		mov	ax,offset iso_open_hack
 		stosw
-		mov	ax,offset iso_read_hack
+		mov	al,offset iso_read_hack-0F000h
 		stosw
-		mov	ax,offset iso_lseek_hack
+		mov	al,offset iso_lseek_hack-0F000h
 		stosw
-		mov	ax,offset iso_close_hack
+		mov	al,offset iso_close_hack-0F000h
 		stosw
-;		mov	ax,offset iso_cleanup_hack
+;		mov	al,offset iso_cleanup_hack-0F000h
 ;		stosw
 		global	@_cpuhaslm$qv:near
 @_cpuhaslm$qv:
-		mov	ax,[132h]
+		mov	ax,[132h+3]
 		and	al,20h
 		ret
 
diff -r 84337bb7d849 -r d964f766faa5 linld/stuff/src/_BEG.ASM
--- a/linld/stuff/src/_BEG.ASM	Wed Nov 18 09:50:51 2020 +0000
+++ b/linld/stuff/src/_BEG.ASM	Fri Nov 20 11:26:49 2020 +0000
@@ -32,6 +32,7 @@
         global  _bss_start:byte
         label   _bss_start byte
         global  stktop:byte
+		ifndef	ISOHOOK
 		ifdef	NO386
         global  _cpu386:byte
 _cpu386		db	?
@@ -39,6 +40,7 @@
 		endif
         global  _cpu_features:dword
 _cpu_features	dd	?
+		endif
         ends    _BSS
 
         segment _TEXT byte public use16 'CODE'
@@ -115,7 +117,13 @@
 iso_close_hack	dw	@ret
 		global	iso_cleanup_hack
 iso_cleanup_hack	dw	@ret
-		dw	_cpu_features+3
+	        global  _cpu_features:dword
+_cpu_features	dd	?		; default _cpu_features+3=1Fh/8Eh (bit5=0, not 64bits)
+		org	$-4
+		ifdef	NO386
+	        global  _cpu386:byte
+_cpu386		db	0
+		endif
 	endif
 
 ;***************************************************************