Changeset fcd7053 in mainline for uspace/lib


Ignore:
Timestamp:
2009-02-12T20:11:25Z (17 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
fa024ce
Parents:
84266669
Message:

cleanup configuration
code cleanup

Location:
uspace/lib
Files:
1 added
21 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/libblock/Makefile

    r84266669 rfcd7053  
    3131#
    3232
    33 -include ../../../Makefile.config
     33LIBC_PREFIX = ../libc
    3434
    35 LIBC_PREFIX = ../libc
    3635## Setup toolchain
    3736#
    … …  
    6059
    6160depend:
    62         -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
     61        -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
    6362
    6463libblock.a: depend $(OBJECTS)

  • uspace/lib/libc/Makefile

    r84266669 rfcd7053  
    3030#
    3131
    32 -include ../../../Makefile.config
    33 
    3432LIBC_PREFIX = $(shell pwd)
    3533SOFTINT_PREFIX = ../softint
     34
     35ifndef CROSS_PREFIX
     36        CROSS_PREFIX = /usr/local
     37endif
     38
    3639
    3740## Setup toolchain
    … …  
    4043include $(LIBC_PREFIX)/Makefile.toolchain
    4144
     45
    4246## Sources
    4347#
    44 
    4548
    4649GENERIC_SOURCES = \
    … …  
    8891
    8992ARCH_SOURCES += \
    90         arch/$(ARCH)/src/entry.s \
    91         arch/$(ARCH)/src/thread_entry.s
     93        arch/$(UARCH)/src/entry.s \
     94        arch/$(UARCH)/src/thread_entry.s
    9295
    9396GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
    … …  
    97100.PHONY: all clean depend kerninc
    98101
    99 all: kerninc libc.a arch/$(ARCH)/_link.ld
     102all: kerninc libc.a arch/$(UARCH)/_link.ld
    100103
    101104kerninc:
    102105        ln -sfn ../../../../kernel/generic/include include/kernel
    103106        ln -sfn kernel/arch include/arch
    104         ln -sfn ../arch/$(ARCH)/include include/libarch
     107        ln -sfn ../arch/$(UARCH)/include include/libarch
    105108
    106109-include Makefile.depend
    107110
    108111clean:
    109         -rm -f include/kernel include/arch include/libarch libc.a arch/$(ARCH)/_link.ld Makefile.depend
    110         find generic/ arch/$(ARCH)/ malloc -name '*.o' -follow -exec rm \{\} \;
     112        -rm -f include/kernel include/arch include/libarch libc.a arch/$(UARCH)/_link.ld Makefile.depend
     113        find generic/ arch/$(UARCH)/ malloc -name '*.o' -follow -exec rm \{\} \;
    111114
    112115depend: kerninc
    113         -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
     116        -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
    114117
    115118libc.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
    116119        $(AR) rc libc.a $(LIBS) $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
    117120
    118 arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
     121arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
    119122        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
    120123

  • uspace/lib/libc/Makefile.toolchain

    r84266669 rfcd7053  
    2727#
    2828
    29 DEFS = -DARCH=$(ARCH)
    30 CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -O3 -nostdlib -nostdinc -I$(LIBC_PREFIX)/include -pipe -g
     29CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -O3 -nostdlib -nostdinc -imacros $(LIBC_PREFIX)/../../../config.h -I$(LIBC_PREFIX)/include -pipe -g
    3130LFLAGS = -M -N $(SOFTINT_PREFIX)/libsoftint.a
    3231AFLAGS =
    … …  
    3534#
    3635
    37 -include $(LIBC_PREFIX)/arch/$(ARCH)/Makefile.inc
     36-include $(LIBC_PREFIX)/../../../Makefile.config
     37-include $(LIBC_PREFIX)/../../../config.defs
     38-include $(LIBC_PREFIX)/arch/$(UARCH)/Makefile.inc
    3839
    3940## Simple detection of the host system
    … …  
    5960        OBJCOPY = $(BINUTILS_PREFIX)objcopy
    6061        OBJDUMP = $(BINUTILS_PREFIX)objdump
     62        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    6163endif
    6264
    … …  
    6870        OBJCOPY = objcopy
    6971        OBJDUMP = objdump
     72        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    7073endif
    7174
    … …  
    7780        OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
    7881        OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
     82        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    7983endif
    80 

  • uspace/lib/libc/arch/amd64/Makefile.inc

    r84266669 rfcd7053  
    3030#
    3131
    32 ifndef CROSS_PREFIX
    33         CROSS_PREFIX = /usr/local
    34 endif
    35 
    3632TARGET = amd64-linux-gnu
    3733TOOLCHAIN_DIR = $(CROSS_PREFIX)/amd64/bin
    3834
    39 ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
    40                 arch/$(ARCH)/src/fibril.S \
    41                 arch/$(ARCH)/src/tls.c
     35ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
     36        arch/$(UARCH)/src/fibril.S \
     37        arch/$(UARCH)/src/tls.c
    4238
    4339LFLAGS += -N

  • uspace/lib/libc/arch/amd64/_link.ld.in

    r84266669 rfcd7053  
    1 STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
     1STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
    22ENTRY(__entry)
    33

  • uspace/lib/libc/arch/arm32/Makefile.inc

    r84266669 rfcd7053  
    3131#
    3232
    33 ifndef CROSS_PREFIX
    34         CROSS_PREFIX = /usr/local
    35 endif
    36 
    3733TARGET = arm-linux-gnu
    3834TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm/bin
    3935CFLAGS += -ffixed-r9 -mtp=soft
    4036LFLAGS += -N $(SOFTINT_PREFIX)/libsoftint.a
    41 AFLAGS += 
     37AFLAGS +=
    4238
    43 ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
    44                 arch/$(ARCH)/src/fibril.S \
    45                 arch/$(ARCH)/src/tls.c \
    46                 arch/$(ARCH)/src/eabi.S
     39ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
     40        arch/$(UARCH)/src/fibril.S \
     41        arch/$(UARCH)/src/tls.c \
     42        arch/$(UARCH)/src/eabi.S
    4743
    4844BFD_NAME = elf32-littlearm

  • uspace/lib/libc/arch/arm32/_link.ld.in

    r84266669 rfcd7053  
    1 STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
     1STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
    22ENTRY(__entry)
    33

  • uspace/lib/libc/arch/ia32/Makefile.inc

    r84266669 rfcd7053  
    3030#
    3131
    32 ifndef CROSS_PREFIX
    33         CROSS_PREFIX = /usr/local
    34 endif
    35 
    3632TARGET = i686-pc-linux-gnu
    3733TOOLCHAIN_DIR = $(CROSS_PREFIX)/i686/bin
    3834
    39 ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
    40                 arch/$(ARCH)/src/fibril.S \
    41                 arch/$(ARCH)/src/tls.c \
    42                 arch/$(ARCH)/src/setjmp.S
     35ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
     36        arch/$(UARCH)/src/fibril.S \
     37        arch/$(UARCH)/src/tls.c \
     38        arch/$(UARCH)/src/setjmp.S
    4339
    4440LFLAGS += -N

  • uspace/lib/libc/arch/ia32/_link.ld.in

    r84266669 rfcd7053  
    1 STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
     1STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
    22ENTRY(__entry)
    33

  • uspace/lib/libc/arch/ia64/Makefile.inc

    r84266669 rfcd7053  
    3030#
    3131
    32 ifndef CROSS_PREFIX
    33         CROSS_PREFIX = /usr/local
    34 endif
    35 
    3632TARGET = ia64-pc-linux-gnu
    3733TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia64/bin
    … …  
    4036AFLAGS +=
    4137
    42 ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
    43                 arch/$(ARCH)/src/fibril.S \
    44                 arch/$(ARCH)/src/tls.c\
    45                 arch/$(ARCH)/src/ddi.c
     38ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
     39        arch/$(UARCH)/src/fibril.S \
     40        arch/$(UARCH)/src/tls.c \
     41        arch/$(UARCH)/src/ddi.c
    4642
    4743BFD_NAME = elf64-ia64-little

  • uspace/lib/libc/arch/ia64/_link.ld.in

    r84266669 rfcd7053  
    1 STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
     1STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
    22ENTRY(__entry)
    33

  • uspace/lib/libc/arch/mips32/Makefile.inc

    r84266669 rfcd7053  
    3030#
    3131
    32 ifndef CROSS_PREFIX
    33         CROSS_PREFIX = /usr/local
    34 endif
    35 
    3632TARGET = mipsel-linux-gnu
    3733TOOLCHAIN_DIR = $(CROSS_PREFIX)/mipsel/bin
    3834CFLAGS += -mips3
    3935
    40 -include ../../../Makefile.config
    41 ifeq ($(CONFIG_MIPS_FPU),y)
    42         CFLAGS += -DCONFIG_MIPS_FPU
    43 endif
    44 
    45 ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
    46         arch/$(ARCH)/src/fibril.S \
    47         arch/$(ARCH)/src/tls.c
    48 
     36ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
     37        arch/$(UARCH)/src/fibril.S \
     38        arch/$(UARCH)/src/tls.c
    4939
    5040BFD_ARCH = mips

  • uspace/lib/libc/arch/mips32/_link.ld.in

    r84266669 rfcd7053  
    1 STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
     1STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
    22ENTRY(__entry)
    33

  • uspace/lib/libc/arch/mips32eb/Makefile.inc

    r84266669 rfcd7053  
    3030#
    3131
    32 ifndef CROSS_PREFIX
    33         CROSS_PREFIX = /usr/local
    34 endif
    35 
    3632TARGET = mips-sgi-irix5
    3733TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips/bin
    3834CFLAGS += -mips3
    3935
    40 ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
    41                 arch/$(ARCH)/src/fibril.S \
    42                 arch/$(ARCH)/src/tls.c
     36ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
     37                arch/$(UARCH)/src/fibril.S \
     38                arch/$(UARCH)/src/tls.c
    4339
    4440LFLAGS += -N

  • uspace/lib/libc/arch/ppc32/Makefile.inc

    r84266669 rfcd7053  
    3030#
    3131
    32 ifndef CROSS_PREFIX
    33         CROSS_PREFIX = /usr/local
    34 endif
    35 
    3632TARGET = ppc-linux-gnu
    3733TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc/bin
    3834
    39 ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
    40                 arch/$(ARCH)/src/fibril.S \
    41                 arch/$(ARCH)/src/tls.c
     35ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
     36        arch/$(UARCH)/src/fibril.S \
     37        arch/$(UARCH)/src/tls.c
    4238
    4339CFLAGS += -mcpu=powerpc -msoft-float -m32

  • uspace/lib/libc/arch/ppc32/_link.ld.in

    r84266669 rfcd7053  
    1 STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
     1STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
    22ENTRY(__entry)
    33

  • uspace/lib/libc/arch/sparc64/Makefile.inc

    r84266669 rfcd7053  
    3030#
    3131
    32 ifndef CROSS_PREFIX
    33         CROSS_PREFIX = /usr/local
    34 endif
    35 
    3632TARGET = sparc64-linux-gnu
    3733TOOLCHAIN_DIR = $(CROSS_PREFIX)/sparc64/bin
    3834
    39 ARCH_SOURCES += arch/$(ARCH)/src/fibril.S \
    40                 arch/$(ARCH)/src/tls.c
     35ARCH_SOURCES += arch/$(UARCH)/src/fibril.S \
     36        arch/$(UARCH)/src/tls.c
    4137
    4238CFLAGS += -mcpu=ultrasparc -m64

  • uspace/lib/libc/arch/sparc64/_link.ld.in

    r84266669 rfcd7053  
    1 STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
     1STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
    22ENTRY(__entry)
    33

  • uspace/lib/libfs/Makefile

    r84266669 rfcd7053  
    3131#
    3232
    33 -include ../../../Makefile.config
     33LIBC_PREFIX = ../libc
    3434
    35 LIBC_PREFIX = ../libc
    3635## Setup toolchain
    3736#
    … …  
    6059
    6160depend:
    62         -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
     61        -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
    6362
    6463libfs.a: depend $(OBJECTS)

  • uspace/lib/softfloat/Makefile

    r84266669 rfcd7053  
    3030#
    3131
    32 -include ../../../Makefile.config
     32LIBC_PREFIX = ../libc
    3333
    34 LIBC_PREFIX = ../libc
    3534## Setup toolchain
    3635#
    … …  
    3837include $(LIBC_PREFIX)/Makefile.toolchain
    3938
    40 CFLAGS +=-Iinclude -Iarch/$(ARCH)/include/
     39CFLAGS +=-Iinclude -Iarch/$(UARCH)/include/
    4140
    4241## Sources
    4342#
    4443
    45 GENERIC_SOURCES =               \
    46         generic/add.c           \
    47         generic/common.c        \
    48         generic/comparison.c    \
    49         generic/conversion.c    \
    50         generic/div.c           \
    51         generic/mul.c           \
    52         generic/other.c         \
    53         generic/softfloat.c     \
     44GENERIC_SOURCES = \
     45        generic/add.c \
     46        generic/common.c \
     47        generic/comparison.c \
     48        generic/conversion.c \
     49        generic/div.c \
     50        generic/mul.c \
     51        generic/other.c \
     52        generic/softfloat.c \
    5453        generic/sub.c
    5554
    … …  
    6968
    7069depend:
    71         -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
     70        -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
    7271
    7372libsoftfloat.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)

  • uspace/lib/softint/Makefile

    r84266669 rfcd7053  
    3030#
    3131
    32 -include ../../../Makefile.config
     32LIBC_PREFIX = ../libc
    3333
    34 LIBC_PREFIX = ../libc
    3534## Setup toolchain
    3635#
    … …  
    6160
    6261depend:
    63         -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
     62        -makedepend -f - -- $(DEPEMD_DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
    6463
    6564libsoftint.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
Note: See TracChangeset for help on using the changeset viewer.