Changeset 177e4ea in mainline for boot/arch/ia64


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:
boot/arch/ia64/loader
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/ia64/loader/Makefile

    r3ad309d r177e4ea  
    2929
    3030include Makefile.common
     31include ../../../../Makefile.common
    3132include ../../../../Makefile.config
    3233
    3334.PHONY: all clean
    3435
    35 all: ../../../../version ../../../../Makefile.config ../../../../config.h ../../../../config.defs
     36all: ../../../../version ../../../../Makefile.common ../../../../Makefile.config ../../../../config.h ../../../../config.defs
    3637        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    3738        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)

  • boot/arch/ia64/loader/Makefile.build

    r3ad309d r177e4ea  
    3232
    3333include ../../../../version
     34include ../../../../Makefile.common
    3435include ../../../../Makefile.config
    3536include ../../../../config.defs
    … …  
    6061$(OUTPUT): $(OBJECTS) $(COMPONENT_OBJECTS) $(LINK)
    6162        $(LD) -no-check-sections -N -T $(LINK) $(COMPONENT_OBJECTS) $(OBJECTS) -o $@
    62         $(MAKE) -C gefi/HelenOS PREFIX=$(GEFI_PREFIX)
     63        $(MAKE) -C gefi/HelenOS
    6364        cp gefi/HelenOS/hello.efi ../../../../
    6465        cp gefi/HelenOS/image.bin ../../../../

  • boot/arch/ia64/loader/Makefile.common

    r3ad309d r177e4ea  
    3131#
    3232
     33include ../../../../Makefile.common
    3334include ../../../../Makefile.config
    3435include ../../../Makefile.common

  • boot/arch/ia64/loader/Makefile.toolchain

    r3ad309d r177e4ea  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    32 ifndef CROSS_PREFIX
    33         CROSS_PREFIX = /usr/local
    34 endif
    35 
    3629BFD_NAME = elf64-ia64-little
    3730BFD_ARCH = ia64
    38 TARGET = ia64-pc-linux-gnu
    39 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia64/bin
    4031
    4132JOBFILE = ../../../../tools/jobfile.py
    42 
    43 ifeq ($(COMPILER),gcc_native)
    44         CC = gcc
    45         AS = as
    46         LD = ld
    47         OBJCOPY = objcopy
    48         OBJDUMP = objdump
    49         GEFI_PREFIX =
    50 endif
    51 
    52 ifeq ($(COMPILER),icc)
    53         CC = icc
    54         AS = as
    55         LD = ld
    56         OBJCOPY = objcopy
    57         OBJDUMP = objdump
    58         GEFI_PREFIX =
    59 endif
    60 
    61 ifeq ($(COMPILER),gcc_cross)
    62         CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
    63         AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
    64         LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
    65         OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
    66         OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
    67         GEFI_PREFIX = $(TOOLCHAIN_DIR)/$(TARGET)-
    68 endif
    6933
    7034CFLAGS = \

  • boot/arch/ia64/loader/gefi/HelenOS/Makefile

    r3ad309d r177e4ea  
    2222#
    2323
    24 prefix=$(PREFIX)
    2524include ../Make.defaults
    2625CDIR=$(TOPDIR)/..
    … …  
    6968
    7069gefi:
    71         $(MAKE) -C .. prefix=$(PREFIX)
     70        $(MAKE) -C ..

  • boot/arch/ia64/loader/gefi/Make.defaults

    r3ad309d r177e4ea  
    2626# lib and include under the root
    2727#
     28
     29include ../../../../../Makefile.common
     30
    2831INSTALLROOT=/usr/local
    2932
    … …  
    3134
    3235ARCH       = ia64
    33 INCDIR     = -I. -I$(CDIR)/inc -I$(CDIR)/inc/$(ARCH) -I$(CDIR)/inc/protocol 
     36INCDIR     = -I. -I$(CDIR)/inc -I$(CDIR)/inc/$(ARCH) -I$(CDIR)/inc/protocol
    3437CPPFLAGS   = -DCONFIG_$(ARCH)
    3538CFLAGS     = -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants -frename-registers -mfixed-range=f32-f127
    3639LDFLAGS    = -nostdlib
    3740INSTALL    = install
    38 
    39 CC         = $(prefix)gcc
    40 AS         = $(prefix)as
    41 LD         = $(prefix)ld
    42 AR         = $(prefix)ar
    43 RANLIB     = $(prefix)ranlib
    44 OBJCOPY    = $(prefix)objcopy
    45 OBJDUMP    = $(prefix)objdump
Note: See TracChangeset for help on using the changeset viewer.