WebSVN – HelenOS – Path Comparison – / – /branches/dynload/uspace/lib/ Rev 4341 and /branches/dynload/uspace/lib/ Rev 4342

Ignore whitespace Rev 4341 → Rev 4342

 /branches/dynload/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)

 /branches/dynload/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)

 /branches/dynload/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)

/branches/dynload/uspace/lib/softfloat/arch/ppc64/include/functions.h
File deleted

 /branches/dynload/uspace/lib/rtld/Makefile
 ,7 → 34,7
 LIBC_PREFIX = ../../lib/libc
 include $(LIBC_PREFIX)/Makefile.toolchain
-include arch/$(ARCH)/Makefile.inc
+include arch/$(UARCH)/Makefile.inc
 #CFLAGS += -Iinclude -I../../srv/loader/include  -fPIC -O0 -ggdb
 #LFLAGS += -shared --no-undefined -soname rtld.so
 ,13 → 75,13
 all: inc $(OUTPUT) librtld.pic.a
 inc:
-    ln -sfn ../arch/$(ARCH)/include include/arch
+    ln -sfn ../arch/$(UARCH)/include include/arch
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) librtld.pic.a $(OUTPUT).map $(OUTPUT).disasm $(OUTPUT).sections Makefile.depend *.o $(PIC_OBJECTS) arch/$(ARCH)/_link.ld include/arch
-    find arch/$(ARCH)/ -name '*.o' -follow -exec rm \{\} \;
+    -rm -f $(OUTPUT) librtld.pic.a $(OUTPUT).map $(OUTPUT).disasm $(OUTPUT).sections Makefile.depend *.o $(PIC_OBJECTS) arch/$(UARCH)/_link.ld include/arch
+    find arch/$(UARCH)/ -name '*.o' -follow -exec rm \{\} \;
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(ARCH_SOURCES) $(GENERIC_SOURCES)> Makefile.depend

/branches/dynload/uspace/lib/rtld/arch/ppc32/Makefile.inc
29,5 → 29,5
CFLAGS += -D__32_BITS__

ARCH_SOURCES := \
arch/$(ARCH)/src/dynamic.c \
arch/$(ARCH)/src/reloc.c
arch/$(UARCH)/src/dynamic.c \
arch/$(UARCH)/src/reloc.c

/branches/dynload/uspace/lib/rtld/arch/mips32/Makefile.inc
29,5 → 29,5
CFLAGS += -D__32_BITS__

ARCH_SOURCES := \
arch/$(ARCH)/src/dynamic.c \
arch/$(ARCH)/src/reloc.c
arch/$(UARCH)/src/dynamic.c \
arch/$(UARCH)/src/reloc.c

/branches/dynload/uspace/lib/rtld/arch/ia32/Makefile.inc
29,5 → 29,5
CFLAGS += -D__32_BITS__

ARCH_SOURCES := \
arch/$(ARCH)/src/dynamic.c \
arch/$(ARCH)/src/reloc.c
arch/$(UARCH)/src/dynamic.c \
arch/$(UARCH)/src/reloc.c

 /branches/dynload/uspace/lib/libtest/Makefile
 ,7 → 27,6
 #
 include ../../../version
--include ../../../Makefile.config
 ## Setup toolchain
 #
 ,14 → 47,6
 DEFS += -DRELEASE=\"$(RELEASE)\"
-ifdef REVISION
-    DEFS += "-DREVISION=\"$(REVISION)\""
-endif
-ifdef TIMESTAMP
-    DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
 ## Sources
 #
 ,19 → 62,19
 all: $(OUTPUT) disasm sections
 inc:
-    ln -sfn ../arch/$(ARCH)/include include/arch
+    ln -sfn ../arch/$(UARCH)/include include/arch
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm $(OUTPUT).sections Makefile.depend *.o arch/$(ARCH)/_link.ld
-    find arch/$(ARCH)/ -name '*.o' -follow -exec rm \{\} \;
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm $(OUTPUT).sections Makefile.depend *.o arch/$(UARCH)/_link.ld
+    find arch/$(UARCH)/ -name '*.o' -follow -exec rm \{\} \;
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(ARCH_SOURCES) $(GENERIC_SOURCES)> Makefile.depend
-$(OUTPUT): $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(LIBS) arch/$(ARCH)/_link.ld
-    $(LD) -T arch/$(ARCH)/_link.ld $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+$(OUTPUT): $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(LIBS) arch/$(UARCH)/_link.ld
+    $(LD) -T arch/$(UARCH)/_link.ld $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm:
     $(OBJDUMP) -d -S -s $(OUTPUT) >$(OUTPUT).disasm
 ,7 → 82,7
 sections:
     $(OBJDUMP) -h $(OUTPUT) >$(OUTPUT).sections
-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

 /branches/dynload/uspace/lib/softint/Makefile
 ,9 → 30,8
 ## Common compiler flags
 #
--include ../../../Makefile.config
+LIBC_PREFIX = ../libc
-LIBC_PREFIX = ../libc
 ## Setup toolchain
 #
 ,7 → 64,7
     find generic/ \( -name '*.o' -o -name '*.pio' \) -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
     -makedepend $(DEFS) $(PIC_CFLAGS) -o.pio -f - $(GENERIC_SOURCES) >> Makefile.depend 2> /dev/null
 libsoftint.a: depend $(OBJECTS)

 /branches/dynload/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
+/** @}
+ */

 /branches/dynload/uspace/lib/libc/shared/Makefile
 ,7 → 27,6
 #
 include ../../../../version
--include ../../../../Makefile.config
 ## Setup toolchain
 #
 ,7 → 36,7
 SOFTINT_PREFIX = ../../../lib/softint
 RTLD_PREFIX = ../../../lib/rtld
 include $(LIBC_PREFIX)/Makefile.toolchain
-#include arch/$(ARCH)/Makefile.inc
+#include arch/$(UARCH)/Makefile.inc
 ARCH_SOURCES :=
 LFLAGS = -shared -soname libc.so.0 --whole-archive
 ,14 → 48,6
 DEFS += -DRELEASE=\"$(RELEASE)\"
-ifdef REVISION
-    DEFS += "-DREVISION=\"$(REVISION)\""
-endif
-ifdef TIMESTAMP
-    DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
 ## Sources
 #
 ,22 → 55,22
 .PHONY: all clean
-all: $(OUTPUT) arch/$(ARCH)/_link.ld
+all: $(OUTPUT) arch/$(UARCH)/_link.ld
 inc:
-    ln -sfn ../arch/$(ARCH)/include include/arch
+    ln -sfn ../arch/$(UARCH)/include include/arch
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm $(OUTPUT).sections Makefile.depend *.o arch/$(ARCH)/_link.ld  arch/$(ARCH)/_lib.ld include/arch
-    find arch/$(ARCH)/ -name '*.o' -follow -exec rm \{\} \;
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm $(OUTPUT).sections Makefile.depend *.o arch/$(UARCH)/_link.ld  arch/$(UARCH)/_lib.ld include/arch
+    find arch/$(UARCH)/ -name '*.o' -follow -exec rm \{\} \;
-$(OUTPUT): $(LIBS) arch/$(ARCH)/_lib.ld
-    $(LD) -T arch/$(ARCH)/_lib.ld $(LFLAGS) $(LIBS) -o $@ -Map $(OUTPUT).map
+$(OUTPUT): $(LIBS) arch/$(UARCH)/_lib.ld
+    $(LD) -T arch/$(UARCH)/_lib.ld $(LFLAGS) $(LIBS) -o $@ -Map $(OUTPUT).map
-arch/$(ARCH)/_lib.ld: arch/$(ARCH)/_lib.ld.in
+arch/$(UARCH)/_lib.ld: arch/$(UARCH)/_lib.ld.in
     $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
-arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
+arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
     $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(APP_LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@

/branches/dynload/uspace/lib/libc/shared/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 {

/branches/dynload/uspace/lib/libc/shared/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 {

/branches/dynload/uspace/lib/libc/shared/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 {

 /branches/dynload/uspace/lib/libc/Makefile.app
 ,8 → 32,8
 ifeq ($(CONFIG_SHARED_LIBC),y)
     LFLAGS := -Bdynamic -I/app/dload -rpath-link $(RTLD_PREFIX)
     LIBS = $(LIBC_PREFIX)/shared/libc.so.0
-    LD_SCRIPT = $(LIBC_PREFIX)/shared/arch/$(ARCH)/_link.ld
+    LD_SCRIPT = $(LIBC_PREFIX)/shared/arch/$(UARCH)/_link.ld
 else
     LIBS = $(LIBC_PREFIX)/libc.a
-    LD_SCRIPT = $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld
+    LD_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
 endif

 /branches/dynload/uspace/lib/libc/Makefile.toolchain
 ,15 → 26,23
 # 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 =
+## Cross-toolchain prefix
+#
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
 ## 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 → 66,7
     AR = $(BINUTILS_PREFIX)ar
     OBJCOPY = $(BINUTILS_PREFIX)objcopy
     OBJDUMP = $(BINUTILS_PREFIX)objdump
+    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 ifeq ($(COMPILER),icc_native)
 ,6 → 76,7
     AR = ar
     OBJCOPY = objcopy
     OBJDUMP = objdump
+    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 ifeq ($(COMPILER),gcc_cross)
 ,5 → 86,5
     AR = $(TOOLCHAIN_DIR)/$(TARGET)-ar
     OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
     OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
+    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif

 /branches/dynload/uspace/lib/libc/Makefile
 ,8 → 30,6
 ## Common compiler flags
 #
--include ../../../Makefile.config
 LIBC_PREFIX = $(shell pwd)
 SOFTINT_PREFIX = ../softint
 RTLD_PREFIX = ../../lib/rtld
 ,7 → 45,6
 ## 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)))
 ,21 → 100,21
 .PHONY: all clean depend kerninc
-all: kerninc libc.a libc.pic.a arch/$(ARCH)/_link.ld
+all: kerninc libc.a libc.pic.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 libc.pic.a arch/$(ARCH)/_link.ld Makefile.depend
+    -rm -f include/kernel include/arch include/libarch libc.a libc.pic.a arch/$(UARCH)/_link.ld Makefile.depend
     find . \( -name '*.o' -o -name '*.pio' \) -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
     -makedepend $(DEFS) $(PIC_CFLAGS) -o.pio -f - $(ARCH_SOURCES) $(GENERIC_SOURCES) >> Makefile.depend 2> /dev/null
 libc.a: depend $(OBJECTS)
 ,7 → 123,7
 libc.pic.a: depend $(PIC_OBJECTS)
     $(AR) rc $@ $(LIBS) $(PIC_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

/branches/dynload/uspace/lib/libc/arch/ppc64/include/thread.h
File deleted

/branches/dynload/uspace/lib/libc/arch/ppc64/include/fibril.h
File deleted

/branches/dynload/uspace/lib/libc/arch/ppc64/include/syscall.h
File deleted

/branches/dynload/uspace/lib/libc/arch/ppc64/include/atomic.h
File deleted

/branches/dynload/uspace/lib/libc/arch/ppc64/include/regname.h
File deleted

/branches/dynload/uspace/lib/libc/arch/ppc64/include/byteorder.h
File deleted

/branches/dynload/uspace/lib/libc/arch/ppc64/include/stackarg.h
File deleted

/branches/dynload/uspace/lib/libc/arch/ppc64/include/faddr.h
File deleted

/branches/dynload/uspace/lib/libc/arch/ppc64/include/limits.h
File deleted

/branches/dynload/uspace/lib/libc/arch/ppc64/include/tls.h
File deleted

/branches/dynload/uspace/lib/libc/arch/ppc64/include/types.h
File deleted

/branches/dynload/uspace/lib/libc/arch/ppc64/include/config.h
File deleted

/branches/dynload/uspace/lib/libc/arch/ppc64/Makefile.inc
File deleted

/branches/dynload/uspace/lib/libc/arch/ppc64/src/entry.s
File deleted

/branches/dynload/uspace/lib/libc/arch/ppc64/src/tls.c
File deleted

/branches/dynload/uspace/lib/libc/arch/ppc64/src/fibril.S
File deleted

/branches/dynload/uspace/lib/libc/arch/ppc64/src/thread_entry.s
File deleted

/branches/dynload/uspace/lib/libc/arch/ppc64/src/syscall.c
File deleted

/branches/dynload/uspace/lib/libc/arch/ppc64/_link.ld.in
File deleted

/branches/dynload/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 {

 /branches/dynload/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

/branches/dynload/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 {

 /branches/dynload/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

/branches/dynload/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 {

 /branches/dynload/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

 /branches/dynload/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

/branches/dynload/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 {

 /branches/dynload/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

/branches/dynload/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 {

 /branches/dynload/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

/branches/dynload/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 {

 /branches/dynload/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

/branches/dynload/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 {

 /branches/dynload/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 4341 → Rev 4342