From 0f1b05ef1c04b0c4fa6b35c8aa15c4feffd56b0b Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sun, 9 Aug 2015 20:22:41 +0200 Subject: [PATCH] prepare the migration to the directory usr --- README.md | 6 ++++++ hermit/Makefile | 12 ++++++------ hermit/tools/Makefile | 2 +- hermit/{newlib => usr}/Makefile | 0 hermit/{newlib => usr}/examples/Makefile | 0 hermit/{newlib => usr}/examples/hello.c | 0 hermit/{newlib => usr}/examples/jacobi.c | 0 hermit/{newlib => usr}/examples/stream.c | 0 hermit/{newlib => usr}/examples/thr_hello.c | 0 9 files changed, 13 insertions(+), 7 deletions(-) rename hermit/{newlib => usr}/Makefile (100%) rename hermit/{newlib => usr}/examples/Makefile (100%) rename hermit/{newlib => usr}/examples/hello.c (100%) rename hermit/{newlib => usr}/examples/jacobi.c (100%) rename hermit/{newlib => usr}/examples/stream.c (100%) rename hermit/{newlib => usr}/examples/thr_hello.c (100%) diff --git a/README.md b/README.md index e69f75268..f60fae6ef 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ # HermitCore - A lightweight extreme-scale statellite kernel The project has just initiated. Further information will be published shortly. + +## Requirements + +* Netwide Assembler (NASM) +* make, binutils +* Tools and libraries to build *linux*, *binutils* and *gcc* (e.g. flex, bison, MPFR library, GMP library, MPC library) diff --git a/hermit/Makefile b/hermit/Makefile index 6d3f0db98..57a3f35f4 100644 --- a/hermit/Makefile +++ b/hermit/Makefile @@ -69,9 +69,9 @@ endif default: all -all: newlib tools $(NAME).elf +all: usr tools $(NAME).elf -newlib: +usr: $Q$(MAKE) ARCH=$(ARCH) \ LDFLAGS="$(LDFLAGS_FOR_NEWLIB)" \ CFLAGS="$(CFLAGS_FOR_NEWLIB)" \ @@ -87,7 +87,7 @@ newlib: OBJCOPY_FOR_TARGET=$(OBJCOPY_FOR_TARGET) \ RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET) \ STRIP_FOR_TARGET=$(STRIP_FOR_TARGET) \ - READELF_FOR_TARGET=$(READELF_FOR_TARGET) -C newlib + READELF_FOR_TARGET=$(READELF_FOR_TARGET) -C usr tools: $Q$(MAKE) ARCH=$(ARCH) CFLAGS="$(CFLAGS_FOR_TOOLS)" LDFLAGS="$(LDFLAGS_FOR_TOOLS)" -C tools @@ -101,13 +101,13 @@ $(NAME).elf: clean: $Q$(RM) $(NAME).elf $(NAME).sym $(NAME).bin *~ $Q$(MAKE) -C tools clean - $Q$(MAKE) -C newlib clean + $Q$(MAKE) -C usr clean @echo Cleaned. veryclean: clean $Q$(RM) qemu-vlan0.pcap include/hermit/config.inc $Q$(MAKE) -C tools veryclean - $Q$(MAKE) -C newlib veryclean + $Q$(MAKE) -C usr veryclean @echo Very cleaned doc: @@ -135,6 +135,6 @@ include/hermit/config.inc: include/hermit/config.h @echo [GCC-ASM] $@ $Q$(CC_FOR_TARGET) $(CFLAGS) -c -o $@ $< -.PHONY: default all clean emu gdb newlib tools +.PHONY: default all clean emu gdb usr tools include $(addsuffix /Makefile,$(SUBDIRS)) diff --git a/hermit/tools/Makefile b/hermit/tools/Makefile index a33fbde51..563a45018 100644 --- a/hermit/tools/Makefile +++ b/hermit/tools/Makefile @@ -5,7 +5,7 @@ CC = gcc CFLAGS = -O2 -Wall HEXDUMP = hexdump LDFLGAS = -EXECFILES = $(shell find ../newlib/examples -perm -u+r+x -type f) +EXECFILES = $(shell find ../usr/examples -perm -u+r+x -type f) # Prettify output V = 0 diff --git a/hermit/newlib/Makefile b/hermit/usr/Makefile similarity index 100% rename from hermit/newlib/Makefile rename to hermit/usr/Makefile diff --git a/hermit/newlib/examples/Makefile b/hermit/usr/examples/Makefile similarity index 100% rename from hermit/newlib/examples/Makefile rename to hermit/usr/examples/Makefile diff --git a/hermit/newlib/examples/hello.c b/hermit/usr/examples/hello.c similarity index 100% rename from hermit/newlib/examples/hello.c rename to hermit/usr/examples/hello.c diff --git a/hermit/newlib/examples/jacobi.c b/hermit/usr/examples/jacobi.c similarity index 100% rename from hermit/newlib/examples/jacobi.c rename to hermit/usr/examples/jacobi.c diff --git a/hermit/newlib/examples/stream.c b/hermit/usr/examples/stream.c similarity index 100% rename from hermit/newlib/examples/stream.c rename to hermit/usr/examples/stream.c diff --git a/hermit/newlib/examples/thr_hello.c b/hermit/usr/examples/thr_hello.c similarity index 100% rename from hermit/newlib/examples/thr_hello.c rename to hermit/usr/examples/thr_hello.c