64bits compilation
This commit is contained in:
parent
c23a3cda7d
commit
64cb73cd70
5
Makefile
5
Makefile
@ -17,8 +17,9 @@
|
|||||||
|
|
||||||
CC=gcc
|
CC=gcc
|
||||||
LD=ld
|
LD=ld
|
||||||
CFLAGS = -Wall -nostdinc -ffreestanding -DKERNEL_SOS
|
CFLAGS = -Wall -nostdinc -ffreestanding -DKERNEL_SOS -m32 \
|
||||||
LDFLAGS = --warn-common -nostdlib
|
-fno-asynchronous-unwind-tables
|
||||||
|
LDFLAGS = --warn-common -nostdlib -m elf_i386
|
||||||
OBJECTS = bootstrap/multiboot.o \
|
OBJECTS = bootstrap/multiboot.o \
|
||||||
hwcore/idt.o hwcore/gdt.o \
|
hwcore/idt.o hwcore/gdt.o \
|
||||||
hwcore/exception.o hwcore/exception_wrappers.o \
|
hwcore/exception.o hwcore/exception_wrappers.o \
|
||||||
|
@ -49,7 +49,7 @@ print_usage () {
|
|||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
grub_dirs_common="/usr/local/share/grub/i386-freebsd /usr/local/share/grub/i386-pc /usr/share/grub/i386-pc /usr/lib/grub/i386-pc /usr/local/grub /usr/share/grub/i386-redhat /usr/local/src/grub-0.5.94 $HOME/share/grub/i386-pc/"
|
grub_dirs_common="/usr/local/share/grub/i386-freebsd /usr/local/share/grub/i386-pc /usr/share/grub/i386-pc /usr/lib/grub/i386-pc /usr/local/grub /usr/share/grub/i386-redhat /usr/local/src/grub-0.5.94 $HOME/share/grub/i386-pc/ /usr/lib/grub/x86_64-unknown"
|
||||||
sbin_grub_path="/usr/local/sbin /usr/sbin /sbin $HOME/sbin"
|
sbin_grub_path="/usr/local/sbin /usr/sbin /sbin $HOME/sbin"
|
||||||
|
|
||||||
PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
|
PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
|
||||||
@ -66,7 +66,7 @@ IMG_FNAME=fd.img
|
|||||||
## Format disk image
|
## Format disk image
|
||||||
##
|
##
|
||||||
init_image () {
|
init_image () {
|
||||||
echo "Initialize disk image $IMG_FILE..."
|
echo "Initialize disk image $IMG_FNAME..."
|
||||||
if [ ! -f $IMG_FNAME ] ; then
|
if [ ! -f $IMG_FNAME ] ; then
|
||||||
dd if=/dev/zero of=$IMG_FNAME bs=18k count=80 1>/dev/null 2>&1
|
dd if=/dev/zero of=$IMG_FNAME bs=18k count=80 1>/dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user