Changeset 177e4ea in mainline for uspace


Ignore:
Timestamp:
2010-03-18T23:34:00Z (16 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3c80f2b
Parents:
3ad309d
Message:

move from a simple sanity check tool to a more feature-rich configuration autotool (generates Makefile.common)
check for the presence of cross-compiler toolchain
correct prefixing of GNU binutils on Solaris
remove redundant toolchain definitions from makefiles

Location:
uspace
Files:
28 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r3ad309d r177e4ea  
    3030#
    3131
     32-include ../Makefile.common
    3233-include ../Makefile.config
    3334

  • uspace/app/Makefile.common

    r3ad309d r177e4ea  
    6060all: \
    6161    $(LIBC_PREFIX)/../../../version \
     62    $(LIBC_PREFIX)/../../../Makefile.common \
    6263    $(LIBC_PREFIX)/../../../Makefile.config \
    6364    $(LIBC_PREFIX)/../../../config.h \

  • uspace/lib/Makefile.common

    r3ad309d r177e4ea  
    5050OBJECTS = $(addsuffix .o,$(basename $(SOURCES)))
    5151
     52-include $(USPACE_PREFIX)/../Makefile.common
    5253-include $(USPACE_PREFIX)/../Makefile.config
    5354include $(LIBC_PREFIX)/Makefile.toolchain
    … …  
    5960all: \
    6061    $(LIBC_PREFIX)/../../../version \
     62    $(LIBC_PREFIX)/../../../Makefile.common \
    6163    $(LIBC_PREFIX)/../../../Makefile.config \
    6264    $(LIBC_PREFIX)/../../../config.h \

  • uspace/lib/libc/Makefile

    r3ad309d r177e4ea  
    2828#
    2929
     30-include ../../../Makefile.common
    3031-include ../../../Makefile.config
    3132

  • uspace/lib/libc/Makefile.toolchain

    r3ad309d r177e4ea  
    5353AFLAGS =
    5454
    55 ## Cross-toolchain prefix
    56 #
    57 
    58 ifndef CROSS_PREFIX
    59         CROSS_PREFIX = /usr/local
    60 endif
    61 
    6255## Setup platform configuration
    6356#
    6457
     58-include $(LIBC_PREFIX)/../../../Makefile.common
    6559-include $(LIBC_PREFIX)/../../../Makefile.config
    6660-include $(LIBC_PREFIX)/../../../config.defs
    6761-include $(LIBC_PREFIX)/arch/$(UARCH)/Makefile.inc
    6862
    69 ## Simple detection of the host system
    70 #
    71 HOST = $(shell uname)
    72 
    73 ## On Solaris, some utilities have different names
    74 #
    75 ifeq ($(HOST),SunOS)
    76         BINUTILS_PREFIX = "g"
    77 else
    78         BINUTILS_PREFIX = ""
    79 endif
    80 
    81 ## Toolchain configuration
     63## Compilation options
    8264#
    8365
    … …  
    8567
    8668ifeq ($(COMPILER),gcc_cross)
    87         CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
    88         GCC = $(CC)
    89         AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
    90         LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
    91         AR = $(TOOLCHAIN_DIR)/$(TARGET)-ar
    92         OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
    93         OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
    9469        CFLAGS = $(GCC_CFLAGS)
    9570        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    … …  
    9772
    9873ifeq ($(COMPILER),gcc_native)
    99         CC = gcc
    100         GCC = $(CC)
    101         AS = $(BINUTILS_PREFIX)as
    102         LD = $(BINUTILS_PREFIX)ld
    103         AR = $(BINUTILS_PREFIX)ar
    104         OBJCOPY = $(BINUTILS_PREFIX)objcopy
    105         OBJDUMP = $(BINUTILS_PREFIX)objdump
    10674        CFLAGS = $(GCC_CFLAGS)
    10775        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    … …  
    10977
    11078ifeq ($(COMPILER),icc)
    111         CC = icc
    112         GCC = gcc
    113         AS = as
    114         LD = ld
    115         AR = ar
    116         OBJCOPY = objcopy
    117         OBJDUMP = objdump
    11879        CFLAGS = $(ICC_CFLAGS)
    11980        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    … …  
    12182
    12283ifeq ($(COMPILER),clang)
    123         CC = clang
    124         GCC = gcc
    125         AS = $(BINUTILS_PREFIX)as
    126         LD = $(BINUTILS_PREFIX)ld
    127         AR = $(BINUTILS_PREFIX)ar
    128         OBJCOPY = $(BINUTILS_PREFIX)objcopy
    129         OBJDUMP = $(BINUTILS_PREFIX)objdump
    13084        CFLAGS = $(CLANG_CFLAGS)
    13185        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)

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

    r3ad309d r177e4ea  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    32 ifeq ($(COMPILER),gcc_cross)
    33         TOOLCHAIN_DIR = $(CROSS_PREFIX)/$(CROSS_TARGET)/bin
    34        
    35         ifeq ($(CROSS_TARGET),arm32)
    36                 TARGET = arm-linux-gnu
    37         endif
    38        
    39         ifeq ($(CROSS_TARGET),ia32)
    40                 TARGET = i686-pc-linux-gnu
    41         endif
    42        
    43         ifeq ($(CROSS_TARGET),mips32)
    44                 TARGET = mipsel-linux-gnu
    45         endif
    46 endif
    47 
    4829ifeq ($(COMPILER),clang)
    4930        CLANG_ARCH = i386

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

    r3ad309d r177e4ea  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    32 TARGET = amd64-linux-gnu
    3329CLANG_ARCH = x86_64
    34 TOOLCHAIN_DIR = $(CROSS_PREFIX)/amd64/bin
    3530
    3631ARCH_SOURCES = \

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

    r3ad309d r177e4ea  
    2828#
    2929
    30 ## Toolchain configuration
    31 #
    32 
    33 TARGET = arm-linux-gnu
    34 TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm32/bin
    35 
    3630ARCH_SOURCES = \
    3731        arch/$(UARCH)/src/entry.s \

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

    r3ad309d r177e4ea  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    32 TARGET = i686-pc-linux-gnu
    3329CLANG_ARCH = i386
    34 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia32/bin
    3530
    3631ARCH_SOURCES = \

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

    r3ad309d r177e4ea  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    32 TARGET = ia64-pc-linux-gnu
    33 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia64/bin
    34 
    3529ARCH_SOURCES = \
    3630        arch/$(UARCH)/src/entry.s \

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

    r3ad309d r177e4ea  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    32 TARGET = mipsel-linux-gnu
    33 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32/bin
    34 
    3529ARCH_SOURCES = \
    3630        arch/$(UARCH)/src/entry.s \

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

    r3ad309d r177e4ea  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    32 TARGET = mips-linux-gnu
    33 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32eb/bin
    34 
    3529ARCH_SOURCES = \
    3630        arch/$(UARCH)/src/entry.s \

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

    r3ad309d r177e4ea  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    32 TARGET = ppc-linux-gnu
    33 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc32/bin
    34 
    3529ARCH_SOURCES = \
    3630        arch/$(UARCH)/src/entry.s \

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

    r3ad309d r177e4ea  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    32 TARGET = sparc64-linux-gnu
    33 TOOLCHAIN_DIR = $(CROSS_PREFIX)/sparc64/bin
    34 
    3529ARCH_SOURCES = \
    3630        arch/$(UARCH)/src/entry.s \

  • uspace/srv/Makefile.common

    r3ad309d r177e4ea  
    6464all: \
    6565    $(LIBC_PREFIX)/../../../version \
     66    $(LIBC_PREFIX)/../../../Makefile.common \
    6667    $(LIBC_PREFIX)/../../../Makefile.config \
    6768    $(LIBC_PREFIX)/../../../config.h \

  • uspace/srv/hid/console/Makefile

    r3ad309d r177e4ea  
    3232.PHONY: all clean
    3333
    34 all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
     34all: $(LIBC_PREFIX)/../../../Makefile.common $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
    3535        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    3636        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)

  • uspace/srv/hid/fb/Makefile

    r3ad309d r177e4ea  
    3232.PHONY: all clean
    3333
    34 all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
     34all: $(LIBC_PREFIX)/../../../Makefile.common $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
    3535        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    3636        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)

  • uspace/srv/hid/kbd/Makefile

    r3ad309d r177e4ea  
    3232.PHONY: all clean
    3333
    34 all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
     34all: $(LIBC_PREFIX)/../../../Makefile.common $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
    3535        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    3636        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)

  • uspace/srv/loader/Makefile

    r3ad309d r177e4ea  
    2828#
    2929
     30-include ../../../Makefile.common
    3031-include ../../../Makefile.config
    3132-include arch/$(UARCH)/Makefile.inc

  • uspace/srv/net/Makefile

    r3ad309d r177e4ea  
    2727#
    2828
     29include ../../../Makefile.common
    2930include ../../../Makefile.config
    3031

  • uspace/srv/net/app/echo/Makefile

    r3ad309d r177e4ea  
    3232STRUCTURES = $(NET_BASE)structures/
    3333
     34include ../../../../../Makefile.common
    3435include ../../../../../Makefile.config
    3536

  • uspace/srv/net/app/nettest1/Makefile

    r3ad309d r177e4ea  
    3232STRUCTURES = $(NET_BASE)structures/
    3333
     34include ../../../../../Makefile.common
    3435include ../../../../../Makefile.config
    3536

  • uspace/srv/net/app/nettest2/Makefile

    r3ad309d r177e4ea  
    3232STRUCTURES = $(NET_BASE)structures/
    3333
     34include ../../../../../Makefile.common
    3435include ../../../../../Makefile.config
    3536

  • uspace/srv/net/app/ping/Makefile

    r3ad309d r177e4ea  
    3232STRUCTURES = $(NET_BASE)structures/
    3333
     34include ../../../../../Makefile.common
    3435include ../../../../../Makefile.config
    3536

  • uspace/srv/net/net/Makefile

    r3ad309d r177e4ea  
    3232STRUCTURES = $(NET_BASE)structures/
    3333
     34include $(NET_BASE)../../../Makefile.common
    3435include $(NET_BASE)../../../Makefile.config
    3536

  • uspace/srv/net/net/start/Makefile

    r3ad309d r177e4ea  
    3232STRUCTURES = $(NET_BASE)structures/
    3333
     34include ../../../../../Makefile.common
    3435include ../../../../../Makefile.config
    3536

  • uspace/srv/net/netif/dp8390/Makefile

    r3ad309d r177e4ea  
    3232STRUCTURES = $(NET_BASE)structures/
    3333
     34include $(NET_BASE)../../../Makefile.common
    3435include $(NET_BASE)../../../Makefile.config
    3536

  • uspace/srv/net/netif/lo/Makefile

    r3ad309d r177e4ea  
    3232STRUCTURES = $(NET_BASE)structures/
    3333
     34include $(NET_BASE)../../../Makefile.common
    3435include $(NET_BASE)../../../Makefile.config
    3536
Note: See TracChangeset for help on using the changeset viewer.