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

don't include setjmp.S or apm.S in stage1.5.

Browse source
This commit is contained in:
okuji 2000-10-29 07:37:48 +00:00
parent 5ac0d65e2e
commit 582e55cdc4
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2000-10-29 OKUJI Yoshinori <okuji@gnu.org>
* stage2/asm.S [STAGE1_5]: Don't include setjmp.S or apm.S.
2000-10-27 OKUJI Yoshinori <okuji@gnu.org> 2000-10-27 OKUJI Yoshinori <okuji@gnu.org>
* lib/device.c (read_device_map): Don't parse a line, if it is * lib/device.c (read_device_map): Don't parse a line, if it is

6
stage2/asm.S
View file

@ -1323,8 +1323,10 @@ probe_values:
/* Source files are splitted, as they have different copyrights. */ /* Source files are splitted, as they have different copyrights. */
#include "setjmp.S" #ifndef STAGE1_5
#include "apm.S" # include "setjmp.S"
# include "apm.S"
#endif /* ! STAGE1_5 */
/* /*
* console_putchar(c) * console_putchar(c)