Mercurial > hg > Members > taiki > original_os
changeset 2:e4dc4a33b32a
improve Makefile and kernel.cbc. display state of os.
| author | Taiki TAIRA <e095767@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Sun, 13 May 2012 01:24:15 +0900 |
| parents | d89b6aa4f359 |
| children | b541382769e6 |
| files | Makefile Makefile.def |
| diffstat | 2 files changed, 7 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Fri May 11 15:55:15 2012 +0900 +++ b/Makefile Sun May 13 01:24:15 2012 +0900 @@ -1,16 +1,12 @@ include ./Makefile.def -#$(TARGET): kernel.o bootstrap.o -# $(LD) $(LDFLAGS) bootstrap.o kernel.o - -#bootstrap.o: bootstrap.S -# $(CBC) -o bootstrap.o bootstrap.S +default: app -#kernel.o: kernel.cbc -# $(CBC) $(CFLAGS) kernel.o kernel.cbc +os: + @$(MAKE) -f Makefile.os -$(TARGET): kernel.cbc - $(CBC) $(CFLAGS) $(TARGET) kernel.cbc +app: + @$(MAKE) -f Makefile.app clean: - rm -rf *.o kernel + rm -rf *.o kernel kernel.elf
--- a/Makefile.def Fri May 11 15:55:15 2012 +0900 +++ b/Makefile.def Sun May 13 01:24:15 2012 +0900 @@ -1,27 +1,9 @@ -TARGET = kernel HOME = /Users/TaikiTAIRA -prefix_cbc = $(HOME)/hg/CbC/build-CbC/INSTALL_DIR/bin prefix_gcc = $(HOME)/thesis/os/build-tools/gcc/bin prefix_binutils = $(HOME)/thesis/os/build-tools/binutils/bin CC = $(prefix_gcc)/gcc -CBC = $(prefix_cbc)/cbc-gcc-4.6.0 +CBC = cbc-gcc-4.6.0 LD = $(prefix_binutils)/x86_64-os-elf-ld AS = $(prefix_binutils)/x86_64-os-elf-as - -CFLAGS = -m64 \ - -ffreestanding \ - -nostdlib \ - -mcmodel=large \ - -pipe \ - -fno-common \ - -fomit-frame-pointer \ - -g -Wall -O2 -c -o -#ASFLAGS = -pipe -ffreestanding -fno-common \ - -fno-builtin -fomit-frame-pointer -g -Wall -O2 -o -LDFLAGS = -nostdlib \ - -nodefaultlibs \ - -Ttext=0x100000 \ - --oformat elf64-x86-64 -