Browse Source

64bits compilation

master
Mathieu Maret 4 years ago
parent
commit
6b8e97dc50
3 changed files with 9 additions and 9 deletions
  1. +3
    -3
      Makefile
  2. +2
    -2
      support/build_image.sh
  3. +4
    -4
      userland/Makefile

+ 3
- 3
Makefile View File

@ -19,9 +19,9 @@ CC=gcc
LD=ld
CP=cp
STRIP=strip
CFLAGS = -Wall -nostdinc -ffreestanding -DKERNEL_SOS -g
LIBGCC = $(shell $(CC) -print-libgcc-file-name) # To benefit from FP/64bits artihm.
LDFLAGS = --warn-common -nostdlib
CFLAGS = -Wall -nostdinc -ffreestanding -DKERNEL_SOS -g -m32 -fno-asynchronous-unwind-tables
LIBGCC = $(shell $(CC) -print-libgcc-file-name -m32) # To benefit from FP/64bits artihm.
LDFLAGS = --warn-common -nostdlib -m elf_i386
OBJECTS = bootstrap/multiboot.o \
hwcore/idt.o hwcore/gdt.o \
hwcore/swintr.o hwcore/swintr_wrappers.o \


+ 2
- 2
support/build_image.sh View File

@ -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


+ 4
- 4
userland/Makefile View File

@ -20,9 +20,9 @@ AR=ar
CP=cp
STRIP=strip
OBJCOPY=objcopy
CFLAGS = -Wall -nostdinc -ffreestanding -I. -I.. -O
LIBGCC = $(shell $(CC) -print-libgcc-file-name) # To benefit from FP/64bits artihm.
LDFLAGS = -Wl,--warn-common -nostdlib -Wl,-Tldscript.lds
CFLAGS = -Wall -nostdinc -ffreestanding -I. -I.. -O -m32 -fno-asynchronous-unwind-tables
LIBGCC = $(shell $(CC) -print-libgcc-file-name -m32) # To benefit from FP/64bits artihm.
LDFLAGS = -Wl,--warn-common -nostdlib -Wl,-Tldscript.lds -m32 -fno-asynchronous-unwind-tables
# Main target
all: userprogs.kimg
@ -80,7 +80,7 @@ userprogs.kimg: $(PROGS)
>> .userprogs.lds
@echo "} /DISCARD/ : { *(.text) *(.data) *(.bss) } }" \
>> .userprogs.lds
@$(LD) -r -o $@ -T.userprogs.lds
@$(LD) -r -o $@ -T.userprogs.lds -m elf_i386
# Create libraries from object files
%.a:


Loading…
Cancel
Save