Changeset 25b0e6a in mainline

Timestamp:

2005-11-22T15:58:55Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cc6f688

Parents:

7b6c5f4

Message:

break up uspace into separate parts

Files:

• Makefile (modified) (1 diff)
• init/Makefile (added)
• init/init.c (moved) (moved from init.c )
• libc/Makefile (modified) (3 diffs)
• libc/Makefile.toolchain (added)
• libc/_link.ld.in (moved) (moved from _link.ld.in ) (1 diff)

Makefile

@@ -34 +34 @@
 endif
 
-## Common compiler flags
-#
+SOURCES = \
+        libc \
+        init
 
-DEFS = -DARCH=$(ARCH)
-CFLAGS = -fno-builtin -fomit-frame-pointer -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -nostdlib -nostdinc -Ilibc/include
-LFLAGS = -M
-AFLAGS =
+CLEANS := $(addsuffix .clean,$(SOURCES))
 
-## Setup platform configuration
-#
+.PHONY: all $(SOURCES) $(CLEANS) clean
 
-include libc/arch/$(ARCH)/Makefile.inc
+all: $(SOURCES)
 
-## Toolchain configuration
-#
+clean: $(CLEANS)
+        find $(SOURCES) -name '*.o' -follow -exec rm \{\} \;
 
-ifeq ($(COMPILER),native)
-        CC = gcc
-        AS = as
-        LD = ld
-        OBJCOPY = objcopy
-        OBJDUMP = objdump
-else
-        CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
-        AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
-        LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
-        OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
-        OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
-endif
+$(CLEANS):
+        $(MAKE) -C $(basename $@) clean ARCH=$(ARCH)
 
-.PHONY: all clean
-
-all: init
-
-clean:
-        -rm -f init init.map _link.ld *.o
-        $(MAKE) -C libc clean ARCH=$(ARCH)
-
-libc/libc.a:
-        $(MAKE) -C libc all ARCH=$(ARCH)
-
-_link.ld: _link.ld.in
-        $(CC) $(DEFS) $(CFLAGS) -E -x c $< | grep -v "^\#" > $@
-
-init: init.o libc/libc.a _link.ld
-        $(LD) -T _link.ld $(LFLAGS) init.o libc/libc.a -o $@ -Map init.map
-
-%.o: %.S
-        $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
-
-%.o: %.s
-        $(AS) $(AFLAGS) $< -o $@
-
-%.o: %.c
-        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
+$(SOURCES):
+        $(MAKE) -C $@ all ARCH=$(ARCH)

libc/Makefile

@@ -27 +27 @@
 #
 
-## Make some default assumptions
-#
-
-ifndef ARCH
-        ARCH = ia32
-endif
-
 ## Common compiler flags
 #
 
+LIBC_PREFIX = .
 DEFS = -DARCH=$(ARCH)
-CFLAGS = -fno-builtin -fomit-frame-pointer -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -nostdlib -nostdinc -Iinclude
+CFLAGS = -fno-builtin -fomit-frame-pointer -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -nostdlib -nostdinc -I$(LIBC_PREFIX)/include
 LFLAGS = -M
 AFLAGS =
 
-## Setup platform configuration
+## Setup toolchain
 #
 
-include arch/$(ARCH)/Makefile.inc
-
-## Toolchain configuration
-#
-
-ifeq ($(COMPILER),native)
-        CC = gcc
-        AS = as
-        LD = ld
-        AR = ar
-        OBJCOPY = objcopy
-        OBJDUMP = objdump
-else
-        CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
-        AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
-        LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
-        AR = $(TOOLCHAIN_DIR)/$(TARGET)-ar
-        OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
-        OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
-endif
+include $(LIBC_PREFIX)/Makefile.toolchain
 
 ## Sources
@@ -81 +56 @@
 .PHONY: all clean depend
 
-all: libc.a
+all: libc.a _link.ld
 
 -include Makefile.depend
 
 clean:
-        -rm -f libc.a Makefile.depend
+        -rm -f libc.a _link.ld Makefile.depend
         find generic/ arch/$(ARCH)/ -name '*.o' -follow -exec rm \{\} \;
 
@@ -94 +69 @@
 libc.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
         $(AR) rc libc.a $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
+
+_link.ld: _link.ld.in
+        $(CC) $(DEFS) $(CFLAGS) -E -x c $< | grep -v "^\#" > $@
 
 %.o: %.S

libc/_link.ld.in

@@ -1 +1 @@
 OUTPUT_FORMAT(binary)
-STARTUP(libc/arch/ARCH/entry.o)
+STARTUP(../libc/arch/ARCH/entry.o)
 ENTRY(__entry)