Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 50989793 in mainline


Ignore:
Timestamp:
2009-10-21T11:25:24Z (11 years ago)
Author:
Martin Decky <martin@…>
Branches:
master
Children:
33eb919, d7365604
Parents:
cc1f8d4
Message:

necessry modifications to sparc64 to support parallel building
(this finally closes #121)

Location:
boot/arch/sparc64
Files:
3 added
2 edited

Legend:

Unmodified
Added
Removed
  • boot/arch/sparc64/Makefile.inc

    rcc1f8d4 r50989793  
    3737build: $(BASE)/image.iso
    3838
    39 $(BASE)/image.iso: depend arch/$(BARCH)/loader/image.boot
     39$(BASE)/image.iso: arch/$(BARCH)/loader/image.boot
    4040        mkdir -p $(TMP)/boot
    4141        mkdir -p $(TMP)/HelenOS
     
    5454        mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o $@ $(TMP)/
    5555
    56 depend:
    57         -rm arch/$(BARCH)/loader/image.boot
    58 
    5956arch/$(BARCH)/loader/image.boot:
    60         $(MAKE) -C arch/$(BARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
     57        $(MAKE) -C arch/$(BARCH)/loader
    6158
    6259clean: generic_clean
    63         $(MAKE) -C arch/$(BARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
    64         -rm -fr $(TMP)
    65         -rm -f $(BASE)/image.iso
     60        $(MAKE) -C arch/$(BARCH)/loader clean
     61        rm -fr $(TMP)
     62        rm -f $(BASE)/image.iso
  • boot/arch/sparc64/loader/Makefile

    rcc1f8d4 r50989793  
    11#
    2 # Copyright (c) 2006 Martin Decky
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
     
    2728#
    2829
    29 include ../../../../version
    30 -include ../../../../Makefile.config
     30include Makefile.common
    3131
    32 ## Toolchain configuration
    33 #
     32.PHONY: all clean
    3433
    35 ifndef CROSS_PREFIX
    36         CROSS_PREFIX = /usr/local
    37 endif
    38 
    39 BFD_NAME = elf64-sparc
    40 BFD_ARCH = sparc
    41 TARGET = sparc64-linux-gnu
    42 TOOLCHAIN_DIR = $(CROSS_PREFIX)/sparc64/bin
    43 
    44 ifeq ($(COMPILER),gcc_native)
    45         CC = gcc
    46         AS = as
    47         LD = ld
    48         OBJCOPY = objcopy
    49         OBJDUMP = objdump
    50 endif
    51 
    52 ifeq ($(COMPILER),gcc_cross)
    53         CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
    54         AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
    55         LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
    56         OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
    57         OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
    58 endif
    59 
    60 CFLAGS = -DRELEASE=$(RELEASE) -I. -I../../../generic -I../../../genarch -imacros ../../../../config.h -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mcpu=ultrasparc -m64 -mno-fpu -pipe
    61 
    62 SOURCES = \
    63         main.c \
    64         _components.c \
    65         ../../../generic/printf.c \
    66         ../../../generic/string.c \
    67         ../../../genarch/balloc.c \
    68         ../../../genarch/ofw.c \
    69         ../../../genarch/ofw_tree.c \
    70         ofwarch.c \
    71         asm.S \
    72         boot.S
    73 
    74 #
    75 # All components that go to image.boot without the ramdisk.
    76 #
    77 COMPONENTS = \
    78         $(KERNELDIR)/kernel.bin \
    79         $(USPACEDIR)/srv/ns/ns \
    80         $(USPACEDIR)/app/init/init \
    81         $(USPACEDIR)/srv/loader/loader \
    82         $(USPACEDIR)/srv/devmap/devmap \
    83         $(USPACEDIR)/srv/bd/rd/rd \
    84         $(USPACEDIR)/srv/vfs/vfs
    85 ifeq ($(RDFMT),tmpfs)
    86         COMPONENTS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
    87 endif
    88 ifeq ($(RDFMT),fat)
    89         COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat
    90 endif
    91 
    92 #
    93 # Final list of all components that go to image.boot.
    94 #
    95 ALL_COMPONENTS = $(COMPONENTS)
    96 ifeq ($(CONFIG_RD_EXTERNAL),n)
    97         ALL_COMPONENTS += ./initrd.img
    98 endif
    99 
    100 RD_SRVS = \
    101         $(USPACEDIR)/srv/fb/fb \
    102         $(USPACEDIR)/srv/kbd/kbd \
    103         $(USPACEDIR)/srv/console/console \
    104         $(USPACEDIR)/srv/fs/devfs/devfs \
    105         $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
    106         $(USPACEDIR)/srv/bd/file_bd/file_bd \
    107         $(USPACEDIR)/srv/part/mbr_part/mbr_part
    108 
    109 ifeq ($(MACHINE),generic)
    110 RD_SRVS += \
    111         $(USPACEDIR)/srv/fs/fat/fat \
    112         $(USPACEDIR)/srv/cir/fhc/fhc \
    113         $(USPACEDIR)/srv/cir/obio/obio
    114 endif
    115 
    116 RD_APPS = \
    117         $(USPACEDIR)/app/edit/edit \
    118         $(USPACEDIR)/app/getvc/getvc \
    119         $(USPACEDIR)/app/tetris/tetris \
    120         $(USPACEDIR)/app/trace/trace \
    121         $(USPACEDIR)/app/bdsh/bdsh \
    122         $(USPACEDIR)/app/klog/klog
    123 
    124 ifeq ($(MACHINE),generic)
    125 RD_APPS += \
    126         $(USPACEDIR)/app/tester/tester
    127 endif
    128 
    129 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    130 ALL_COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(ALL_COMPONENTS))))
    131 
    132 .PHONY: all clean depend
    133 
    134 all: image.boot disasm
    135 
    136 -include Makefile.depend
    137 
    138 image.boot: depend _components.h _link.ld $(ALL_COMPONENT_OBJECTS) $(OBJECTS)
    139         $(LD) -Map image.map -no-check-sections -N -T _link.ld $(ALL_COMPONENT_OBJECTS) $(OBJECTS) -o $@
    140 
    141 depend:
    142         -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
     34all: ../../../../version ../../../../Makefile.config ../../../../config.h ../../../../config.defs
     35        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
     36        $(MAKE) -f Makefile.build
    14337
    14438clean:
    145         -for file in $(RD_SRVS) ; do \
     39        for file in $(RD_SRVS) $(RD_SRVS_GENERIC) ; do \
    14640                rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \
    14741        done
    148         -for file in $(RD_APPS) ; do \
     42        for file in $(RD_APPS) $(RD_APPS_GENERIC) ; do \
    14943                rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
    15044        done
    151         -rm -f _components.h _components.c _link.ld $(ALL_COMPONENT_OBJECTS) $(OBJECTS) initrd.img image.boot image.map image.disasm Makefile.depend
    152 
    153 _components.h _components.c _link.ld $(ALL_COMPONENT_OBJECTS): $(COMPONENTS) $(RD_SRVS) $(RD_APPS) _link.ld.in
    154         for file in $(RD_SRVS) ; do \
    155                 cp $$file $(USPACEDIR)/dist/srv/ ; \
    156         done
    157         for file in $(RD_APPS) ; do \
    158                 cp $$file $(USPACEDIR)/dist/app/ ; \
    159         done
    160 ifeq ($(RDFMT),tmpfs)
    161         ../../../../tools/mktmpfs.py $(USPACEDIR)/dist/ initrd.fs
    162 endif
    163 ifeq ($(RDFMT),fat)
    164         ../../../../tools/mkfat.py $(USPACEDIR)/dist/ initrd.fs
    165 endif
    166         ../../../../tools/mkhord.py 16384 initrd.fs initrd.img
    167         rm initrd.fs
    168         ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 1 "unsigned long" $(ALL_COMPONENTS)
    169 
    170 %.o: %.S
    171         $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
    172 
    173 %.o: %.c
    174         $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
    175 
    176 disasm: image.boot
    177         $(OBJDUMP) -d image.boot > image.disasm
     45        rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(COMPS).h $(COMPS).c $(LINK) $(INITRD).img $(INITRD).fs
     46        find . -name '*.o' -follow -exec rm \{\} \;
     47        find . -name '*.co' -follow -exec rm \{\} \;
Note: See TracChangeset for help on using the changeset viewer.