From 6cbfe3ffced2893f51c0024ef6eefe5ca7dcd606 Mon Sep 17 00:00:00 2001 From: Mathieu Maret Date: Sun, 29 Jan 2017 14:21:05 +0100 Subject: [PATCH] 64bits compilation --- Makefile | 5 +++-- support/build_image.sh | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6ac7e75..f2b003d 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ CC=gcc -CFLAGS = -Wall -nostdlib -nostdinc -ffreestanding -DKERNEL_SOS -LDFLAGS = --warn-common +CFLAGS = -Wall -nostdlib -nostdinc -ffreestanding -DKERNEL_SOS \ + -m32 -fno-asynchronous-unwind-tables +LDFLAGS = --warn-common -m elf_i386 OBJECTS = bootstrap/multiboot.o \ hwcore/idt.o hwcore/gdt.o \ hwcore/exception.o hwcore/exception_wrappers.o \ diff --git a/support/build_image.sh b/support/build_image.sh index 43929cd..aeafd02 100755 --- a/support/build_image.sh +++ b/support/build_image.sh @@ -49,7 +49,7 @@ print_usage () { 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" PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin @@ -66,7 +66,7 @@ IMG_FNAME=fd.img ## Format disk image ## init_image () { - echo "Initialize disk image $IMG_FILE..." + echo "Initialize disk image $IMG_FNAME..." if [ ! -f $IMG_FNAME ] ; then dd if=/dev/zero of=$IMG_FNAME bs=18k count=80 1>/dev/null 2>&1 fi