vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add a workaround for binutils-2.9.1.0.x into stage1.S.

Browse source
This commit is contained in:
okuji 2000-08-30 19:06:30 +00:00
parent 454e26626c
commit 7f6d84c46f
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2000-08-31 OKUJI Yoshinori <okuji@gnu.org>
* stage1/stage1.S (MOV_MEM_TO_AL): New macro.
(real_start): Use the macro MOV_MEM_TO_AL instead of using movb
directly, because binutils-2.9.1.0.x doesn't produce a short
opcode for it automatically. Reported by Alessandro Rubini
<rubini@gnu.org>.
2000-08-30 OKUJI Yoshinori <okuji@gnu.org> 2000-08-30 OKUJI Yoshinori <okuji@gnu.org>
* configure.in (CPPFLAGS): Remove -Wundef by default. Add the * configure.in (CPPFLAGS): Remove -Wundef by default. Add the

7
stage1/stage1.S
View file

@ -33,6 +33,9 @@
/* Print message string */ /* Print message string */
#define MSG(x) movw $ABS(x), %si; call message #define MSG(x) movw $ABS(x), %si; call message
/* XXX: binutils-2.9.1.0.x doesn't produce a short opcode for this. */
#define MOV_MEM_TO_AL(x) .byte 0xa0; .word x
.file "stage1.S" .file "stage1.S"
.text .text
@ -126,7 +129,7 @@ real_start:
/* /*
* Check if we have a forced disk reference here * Check if we have a forced disk reference here
*/ */
movb ABS(boot_drive), %al MOV_MEM_TO_AL(ABS(boot_drive)) /* movb ABS(boot_drive), %al */
cmpb $0xff, %al cmpb $0xff, %al
je 1f je 1f
movb %al, %dl movb %al, %dl
@ -152,7 +155,7 @@ real_start:
jne chs_mode jne chs_mode
/* check if AH=0x42 is supported if FORCE_LBA is zero */ /* check if AH=0x42 is supported if FORCE_LBA is zero */
movb ABS(force_lba), %al MOV_MEM_TO_AL(ABS(force_lba)) /* movb ABS(force_lba), %al */
testb %al, %al testb %al, %al
jnz skip_lba_bitmap_check jnz skip_lba_bitmap_check
andw $1, %cx andw $1, %cx