diff --git a/Makefile.example b/Makefile.example index ed89e1b4..7fbb6caf 100644 --- a/Makefile.example +++ b/Makefile.example @@ -16,12 +16,12 @@ NASM = nasm NASMFLAGS = -felf32 -g INCLUDE = -I$(TOPDIR)/include -I$(TOPDIR)/arch/$(ARCH)/include -I$(TOPDIR)/lwip/src/include -I$(TOPDIR)/lwip/src/include/ipv4 -I$(TOPDIR)/drivers CC = gcc -CFLAGS = -g -m32 -march=i386 -Wall -O2 -fno-zero-initialized-in-bss -fno-builtin-function -fstrength-reduce -fomit-frame-pointer -finline-functions -nostdinc $(INCLUDE) -fno-stack-protector +CFLAGS = -g -m32 -march=i586 -Wall -O2 -fno-zero-initialized-in-bss -fno-builtin-function -fstrength-reduce -fomit-frame-pointer -finline-functions -nostdinc $(INCLUDE) -fno-stack-protector AR = ar ARFLAGS = rsv RM = rm -rf LD = ld -LDFLAGS = -T link.ld -z max-page-size=4096 --defsym __BUILD_DATE=$(shell date +'%Y%m%d') --defsym __BUILD_TIME=$(shell date +'%H%M%S') --defsym __BUILD_VERSION=$(shell svnversion -cn ../ | sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/" | grep "[0-9]") +LDFLAGS = -T link.ld -z max-page-size=4096 --defsym __BUILD_DATE=$(shell date +'%Y%m%d') --defsym __BUILD_TIME=$(shell date +'%H%M%S') # Prettify output V = 0 @@ -44,7 +44,7 @@ all: newlib $(NAME) # $(OBJCOPY) $(STRIP_DEBUG) $(NAME) newlib: - $(MAKE) ARCH=$(ARCH) CFLAGS="-m32 -march=i386 -fno-stack-protector" NASMFLAGS="-felf32 -g" -C newlib + $(MAKE) ARCH=$(ARCH) CFLAGS="-m32 -march=i586 -fno-stack-protector" NASMFLAGS="-felf32 -g" -C newlib $(NAME): @echo [LD] $(NAME) diff --git a/kernel/main.c b/kernel/main.c index ea0cba17..533f8056 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -41,7 +41,6 @@ extern const void kernel_start; extern const void kernel_end; extern char __BUILD_DATE; extern char __BUILD_TIME; -extern char __BUILD_VERSION; static void list_fs(vfs_node_t* node, uint32_t depth) { @@ -78,7 +77,7 @@ static void list_root(void) { int main(void) { - kprintf("This is MetalSVM %s Build %u, %u, %u\n", METALSVM_VERSION, &__BUILD_VERSION, &__BUILD_DATE, &__BUILD_TIME); + kprintf("This is MetalSVM %s Build %u, %u\n", METALSVM_VERSION, &__BUILD_DATE, &__BUILD_TIME); lowlevel_init(); system_init();