Changeset 0e4ab80 in mainline

Timestamp:

2005-11-16T14:13:31Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1444af8

Parents:

3eddaff

Message:

initial uspace build system

Files:

• Makefile (deleted)
• libc/Makefile (modified) (1 diff)
• libc/arch/ia32/Makefile.inc (added)
• libc/arch/ia32/entry.s (moved) (moved from libc/entry.s )
• libc/generic/libc.c (moved) (moved from libc/libc.c )
• libc/generic/libc.h (moved) (moved from libc/libc.h )
• libc/include/unistd.h (moved) (moved from libc/unistd.h )

libc/Makefile

@@ -1 @@
-include ../../arch/$(ARCH)/Makefile.inc
+#
+# Copyright (C) 2005 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
 
-sources=libc.c \
-        entry.s
+## Make some default assumptions
+#
 
-CFLAGS+=-nostdinc -I. -Werror-implicit-function-declaration -Wmissing-prototypes -Werror
+ifndef ARCH
+        ARCH = ia32
+endif
 
-objects:=$(addsuffix .o,$(basename $(sources)))
+## Common compiler flags
+#
 
-.PHONY : all depend build clean dist-clean
+DEFS = -DARCH=$(ARCH)
+CFLAGS = -fno-builtin -fomit-frame-pointer -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -nostdlib -nostdinc -Iinclude
+LFLAGS = -M
+AFLAGS =
 
-all: dist-clean depend build
+## Setup platform configuration
+#
+
+include arch/$(ARCH)/Makefile.inc
+
+## Toolchain configuration
+#
+
+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
+
+## Sources
+#
+
+GENERIC_SOURCES = \
+        generic/libc.c
+
+ARCH_SOURCES = \
+        arch/$(ARCH)/libc.c
+
+GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
+ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
+
+.PHONY: all clean depend boot
+
+all: libc.a
 
 -include Makefile.depend
 
+clean:
+        -rm -f libc.a
+        find generic/ arch/$(ARCH)/ -name '*.o' -follow -exec rm \{\} \;
+
 depend:
-        $(CC) $(CFLAGS) -M $(sources) >Makefile.depend
+        $(CC) $(DEFS) $(CFLAGS) -M $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend
 
-build: libc.a
+libc.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
+        
 
-clean:
-        find . -name '*.o' -exec rm \{\} \;
-        -rm libc.a
-
-dist-clean:
-        -rm Makefile.depend
-        -$(MAKE) clean
-
-libc.a: $(objects)
-        $(AR) rc libc.a $(objects)
+%.o: %.S
+        $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
 
 %.o: %.s
-        $(AS) $(ASFLAGS) $< -o $@
+        $(AS) $(AFLAGS) $< -o $@
 
 %.o: %.c
-        $(CC) $(CFLAGS) -c $< -o $@
+        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@