WebSVN – HelenOS – Path Comparison – / – /trunk/uspace/lib Rev 3872 and /trunk/uspace/lib Rev 3882

Ignore whitespace Rev 3872 → Rev 3882

 /trunk/uspace/lib/libfs/Makefile
 ,9 → 30,8
 ## Common compiler flags
 #
--include ../../../Makefile.config
+LIBC_PREFIX = ../libc
-LIBC_PREFIX = ../libc
 ## Setup toolchain
 #
 ,7 → 58,7
     find . -name '*.o' -follow -exec rm \{\} \;
 depend:
-    -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
 libfs.a: depend $(OBJECTS)
     $(AR) rc libfs.a $(OBJECTS)

 /trunk/uspace/lib/libblock/Makefile
 ,9 → 30,8
 ## Common compiler flags
 #
--include ../../../Makefile.config
+LIBC_PREFIX = ../libc
-LIBC_PREFIX = ../libc
 ## Setup toolchain
 #
 ,7 → 58,7
     find . -name '*.o' -follow -exec rm \{\} \;
 depend:
-    -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
 libblock.a: depend $(OBJECTS)
     $(AR) rc libblock.a $(OBJECTS)

 /trunk/uspace/lib/softfloat/Makefile
 ,28 → 29,27
 ## Common compiler flags
 #
--include ../../../Makefile.config
+LIBC_PREFIX = ../libc
-LIBC_PREFIX = ../libc
 ## Setup toolchain
 #
 include $(LIBC_PREFIX)/Makefile.toolchain
-CFLAGS +=-Iinclude -Iarch/$(ARCH)/include/
+CFLAGS +=-Iinclude -Iarch/$(UARCH)/include/
 ## Sources
 #
-GENERIC_SOURCES =       \
-    generic/add.c       \
-    generic/common.c    \
-    generic/comparison.c    \
-    generic/conversion.c    \
-    generic/div.c       \
-    generic/mul.c       \
-    generic/other.c     \
-    generic/softfloat.c \
+GENERIC_SOURCES = \
+    generic/add.c \
+    generic/common.c \
+    generic/comparison.c \
+    generic/conversion.c \
+    generic/div.c \
+    generic/mul.c \
+    generic/other.c \
+    generic/softfloat.c \
     generic/sub.c
 ARCH_SOURCES =
 ,7 → 67,7
     find generic/ -name '*.o' -follow -exec rm \{\} \;
 depend:
-    -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
 libsoftfloat.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
     $(AR) rc libsoftfloat.a $(ARCH_OBJECTS) $(GENERIC_OBJECTS)

 /trunk/uspace/lib/softint/Makefile
 ,9 → 29,8
 ## Common compiler flags
 #
--include ../../../Makefile.config
+LIBC_PREFIX = ../libc
-LIBC_PREFIX = ../libc
 ## Setup toolchain
 #
 ,7 → 59,7
     find generic/ -name '*.o' -follow -exec rm \{\} \;
 depend:
-    -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend -f - -- $(DEPEMD_DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
 libsoftint.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
     $(AR) rc libsoftint.a $(ARCH_OBJECTS) $(GENERIC_OBJECTS)

 /trunk/uspace/lib/libc/include/macros.h
 ,0 → 1,50
+/*
+ * Copyright (c) 2009 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.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_MACROS_H_
+#define LIBC_MACROS_H_
+#define SIZE2KB(size) ((size) >> 10)
+#define SIZE2MB(size) ((size) >> 20)
+#define KB2SIZE(kb) ((kb) << 10)
+#define MB2SIZE(mb) ((mb) << 20)
+#define STRING(arg) STRING_ARG(arg)
+#define STRING_ARG(arg) #arg
+#endif
+/** @}
+ */

 /trunk/uspace/lib/libc/Makefile.toolchain
 ,8 → 26,7
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-DEFS = -DARCH=$(ARCH)
-CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -O3 -nostdlib -nostdinc -I$(LIBC_PREFIX)/include -pipe -g
+CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -O3 -nostdlib -nostdinc -imacros $(LIBC_PREFIX)/../../../config.h -I$(LIBC_PREFIX)/include -pipe -g
 LFLAGS = -M -N $(SOFTINT_PREFIX)/libsoftint.a
 AFLAGS =
 ,7 → 33,9
 ## Setup platform configuration
 #
--include $(LIBC_PREFIX)/arch/$(ARCH)/Makefile.inc
+-include $(LIBC_PREFIX)/../../../Makefile.config
+-include $(LIBC_PREFIX)/../../../config.defs
+-include $(LIBC_PREFIX)/arch/$(UARCH)/Makefile.inc
 ## Simple detection of the host system
 #
 ,6 → 59,7
     AR = $(BINUTILS_PREFIX)ar
     OBJCOPY = $(BINUTILS_PREFIX)objcopy
     OBJDUMP = $(BINUTILS_PREFIX)objdump
+    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 ifeq ($(COMPILER),icc_native)
 ,6 → 69,7
     AR = ar
     OBJCOPY = objcopy
     OBJDUMP = objdump
+    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 ifeq ($(COMPILER),gcc_cross)
 ,5 → 79,5
     AR = $(TOOLCHAIN_DIR)/$(TARGET)-ar
     OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
     OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
+    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif

 /trunk/uspace/lib/libc/Makefile
 ,20 → 29,23
 ## Common compiler flags
 #
--include ../../../Makefile.config
 LIBC_PREFIX = $(shell pwd)
 SOFTINT_PREFIX = ../softint
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
 ## Setup toolchain
 #
 include $(LIBC_PREFIX)/Makefile.toolchain
 ## Sources
 #
 GENERIC_SOURCES = \
     generic/libc.c \
     generic/ddi.c \
 ,8 → 90,8
     generic/vfs/canonify.c
 ARCH_SOURCES += \
-    arch/$(ARCH)/src/entry.s \
-    arch/$(ARCH)/src/thread_entry.s
+    arch/$(UARCH)/src/entry.s \
+    arch/$(UARCH)/src/thread_entry.s
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
 ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
 ,26 → 99,26
 .PHONY: all clean depend kerninc
-all: kerninc libc.a arch/$(ARCH)/_link.ld
+all: kerninc libc.a arch/$(UARCH)/_link.ld
 kerninc:
     ln -sfn ../../../../kernel/generic/include include/kernel
     ln -sfn kernel/arch include/arch
-    ln -sfn ../arch/$(ARCH)/include include/libarch
+    ln -sfn ../arch/$(UARCH)/include include/libarch
 -include Makefile.depend
 clean:
-    -rm -f include/kernel include/arch include/libarch libc.a arch/$(ARCH)/_link.ld Makefile.depend
-    find generic/ arch/$(ARCH)/ malloc -name '*.o' -follow -exec rm \{\} \;
+    -rm -f include/kernel include/arch include/libarch libc.a arch/$(UARCH)/_link.ld Makefile.depend
+    find generic/ arch/$(UARCH)/ malloc -name '*.o' -follow -exec rm \{\} \;
 depend: kerninc
-    -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
 libc.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
     $(AR) rc libc.a $(LIBS) $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
-arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
+arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
     $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
 %.o: %.S

/trunk/uspace/lib/libc/arch/sparc64/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /trunk/uspace/lib/libc/arch/sparc64/Makefile.inc
 ,15 → 29,11
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = sparc64-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/sparc64/bin
-ARCH_SOURCES += arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c
+ARCH_SOURCES += arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c
 CFLAGS += -mcpu=ultrasparc -m64
 LFLAGS += -no-check-sections -N

/trunk/uspace/lib/libc/arch/ia64/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /trunk/uspace/lib/libc/arch/ia64/Makefile.inc
 ,10 → 29,6
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = ia64-pc-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia64/bin
 CFLAGS += -fno-unwind-tables -DMALLOC_ALIGNMENT_16
 ,10 → 35,10
 LFLAGS += -N $(SOFTINT_PREFIX)/libsoftint.a
 AFLAGS +=
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c\
-        arch/$(ARCH)/src/ddi.c
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c \
+    arch/$(UARCH)/src/ddi.c
 BFD_NAME = elf64-ia64-little
 BFD_ARCH = ia64-elf64

/trunk/uspace/lib/libc/arch/arm32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /trunk/uspace/lib/libc/arch/arm32/Makefile.inc
 ,20 → 30,16
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = arm-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm/bin
 CFLAGS += -ffixed-r9 -mtp=soft
 LFLAGS += -N $(SOFTINT_PREFIX)/libsoftint.a
-AFLAGS +=
+AFLAGS +=
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c \
-        arch/$(ARCH)/src/eabi.S
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c \
+    arch/$(UARCH)/src/eabi.S
 BFD_NAME = elf32-littlearm
 BFD_ARCH = arm

 /trunk/uspace/lib/libc/arch/mips32eb/Makefile.inc
 ,17 → 29,13
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = mips-sgi-irix5
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips/bin
 CFLAGS += -mips3
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
+        arch/$(UARCH)/src/fibril.S \
+        arch/$(UARCH)/src/tls.c
 LFLAGS += -N

/trunk/uspace/lib/libc/arch/ppc32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /trunk/uspace/lib/libc/arch/ppc32/Makefile.inc
 ,16 → 29,12
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = ppc-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc/bin
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c
 CFLAGS += -mcpu=powerpc -msoft-float -m32
 AFLAGS += -a32

/trunk/uspace/lib/libc/arch/amd64/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /trunk/uspace/lib/libc/arch/amd64/Makefile.inc
 ,16 → 29,12
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = amd64-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/amd64/bin
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c
 LFLAGS += -N

/trunk/uspace/lib/libc/arch/mips32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /trunk/uspace/lib/libc/arch/mips32/Makefile.inc
 ,23 → 29,13
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = mipsel-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mipsel/bin
 CFLAGS += -mips3
--include ../../../Makefile.config
-ifeq ($(CONFIG_MIPS_FPU),y)
-    CFLAGS += -DCONFIG_MIPS_FPU
-endif
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
-    arch/$(ARCH)/src/fibril.S \
-    arch/$(ARCH)/src/tls.c
 BFD_ARCH = mips
 BFD_NAME = elf32-tradlittlemips

/trunk/uspace/lib/libc/arch/ia32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /trunk/uspace/lib/libc/arch/ia32/Makefile.inc
 ,17 → 29,13
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = i686-pc-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/i686/bin
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c \
-        arch/$(ARCH)/src/setjmp.S
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c \
+    arch/$(UARCH)/src/setjmp.S
 LFLAGS += -N

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3872 → Rev 3882