Changeset a5c468e in mainline


Ignore:
Timestamp:
2018-11-11T20:21:08Z (5 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4640416
Parents:
5c03bd30
Message:

Build XCW demo as part of default target. Need to get real CFLAGS to fix some ARM targets, use export target. Make export as part of default target into uspace/export. Update gitignore.

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    r5c03bd30 ra5c468e  
    1313/Makefile.common
    1414/Makefile.config
     15/PKG
    1516/common.h
    1617/config.h
    1718/cscope.out
     19/downloads
    1820/hdisk.img
    1921/image.boot
    … …  
    2729boot/arch/sparc64/_link.ld
    2830boot/components.h
     31boot/components.o.new
    2932boot/components.s
     33boot/components.tar
    3034boot/components.zip
    3135boot/components_desc.c
    … …  
    3539boot/image.raw
    3640boot/initrd.img
     41boot/initrd.img.gz
    3742common.h.new
    3843deps.mk
    … …  
    5156kernel/generic/src/debug/real_map.bin
    5257kernel/kernel.bin
     58kernel/kernel.bin.gz
    5359kernel/kernel.dump
     60kernel/kernel.elf
     61kernel/kernel.elf.gz
    5462kernel/kernel.raw
    5563tag
    … …  
    7179tools/sparc64-linux-gnu
    7280tools/sycek/
     81tools/xcw/demo/viewer
    7382uspace/app/barber/barber
    7483uspace/app/barber/images.c
    … …  
    100109uspace/app/inet/inet
    101110uspace/app/init/init
     111uspace/app/init/init.gz
    102112uspace/app/kill/kill
    103113uspace/app/killall/killall
    … …  
    133143uspace/app/tester/tester
    134144uspace/app/testread/testread
     145uspace/app/testrunner/testrunner
    135146uspace/app/testwrit/testwrit
    136147uspace/app/tetris/tetris
    … …  
    152163uspace/app/vterm/vterm
    153164uspace/app/vuhid/vuh
     165uspace/app/vuhid/vuhid
    154166uspace/app/wavplay/wavplay
    155167uspace/app/websrv/websrv
    … …  
    338350uspace/drv/test/test3/test3
    339351uspace/drv/time/cmos-rtc/cmos-rtc
     352uspace/export
    340353uspace/lib/c/arch/abs32le/_link-dlexe.ld
    341354uspace/lib/c/arch/abs32le/_link-loader.ld
    … …  
    378391uspace/lib/math/test-libmath
    379392uspace/lib/pcut/test-libpcut-*
     393uspace/lib/posix/gcc.specs
     394uspace/lib/posix/link.ld
    380395uspace/lib/posix/test-libposix
    381396uspace/lib/sif/test-libsif
    … …  
    384399uspace/srv/bd/file_bd/file_bd
    385400uspace/srv/bd/rd/rd
     401uspace/srv/bd/rd/rd.gz
    386402uspace/srv/bd/sata_bd/sata_bd
    387403uspace/srv/bd/vbd/vbd
    … …  
    391407uspace/srv/fs/exfat/exfat
    392408uspace/srv/fs/ext4fs/ext4fs
     409uspace/srv/fs/ext4fs/ext4fs.gz
    393410uspace/srv/fs/fat/fat
     411uspace/srv/fs/fat/fat.gz
    394412uspace/srv/fs/locfs/locfs
    395413uspace/srv/fs/mfs/mfs
    … …  
    408426uspace/srv/hw/bus/cuda_adb/cuda_adb
    409427uspace/srv/hw/char/s3c24xx_uart/s3c24ser
     428uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart
    410429uspace/srv/hw/irc/obio/obio
    411430uspace/srv/klog/klog
    412431uspace/srv/loader/loader
     432uspace/srv/loader/loader.gz
    413433uspace/srv/locsrv/locsrv
     434uspace/srv/locsrv/locsrv.gz
    414435uspace/srv/logger/logger
     436uspace/srv/logger/logger.gz
    415437uspace/srv/net/dhcp/dhcp
    416438uspace/srv/net/dnsrsrv/dnsrsrv
    … …  
    424446uspace/srv/net/udp/udp
    425447uspace/srv/ns/ns
     448uspace/srv/ns/ns.gz
    426449uspace/srv/taskmon/taskmon
    427450uspace/srv/test/chardev-test/chardev-test
    428451uspace/srv/vfs/vfs
     452uspace/srv/vfs/vfs.gz
    429453uspace/srv/volsrv/test-volsrv
    430454uspace/srv/volsrv/volsrv
    431 kernel/kernel.elf
    432 uspace/app/testrunner/testrunner
    433 uspace/app/vuhid/vuhid
    434 uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart
    435 boot/components.o.new
    436 boot/components.tar
    437 boot/initrd.img.gz
    438 kernel/kernel.elf.gz
    439 uspace/app/init/init.gz
    440 uspace/srv/bd/rd/rd.gz
    441 uspace/srv/fs/ext4fs/ext4fs.gz
    442 uspace/srv/loader/loader.gz
    443 uspace/srv/locsrv/locsrv.gz
    444 uspace/srv/logger/logger.gz
    445 uspace/srv/ns/ns.gz
    446 uspace/srv/vfs/vfs.gz
    447 kernel/kernel.bin.gz

  • Makefile

    r5c03bd30 ra5c468e  
    5050.PHONY: all precheck cscope cscope_parts autotool config_auto config_default config distclean clean check releasefile release common boot kernel uspace export-posix space
    5151
    52 all: kernel uspace
     52all: kernel uspace export-cross test-xcw
    5353        $(MAKE) -r -C boot PRECHECK=$(PRECHECK)
    5454
    … …  
    6161        $(MAKE) -r -C uspace PRECHECK=$(PRECHECK)
    6262
     63test-xcw: uspace export-cross
     64        export PATH=$$PATH:/data/helenos/master/tools/xcw/bin && $(MAKE) -r -C tools/xcw/demo
     65
    6366export-posix: common
    6467ifndef EXPORT_DIR
    … …  
    6770        $(MAKE) -r -C uspace export EXPORT_DIR=$(abspath $(EXPORT_DIR))
    6871endif
     72
     73export-cross: common
     74        $(MAKE) -r -C uspace export EXPORT_DIR=$(abspath uspace/export)
    6975
    7076precheck: clean
    … …  
    155161        $(MAKE) -r -C boot clean
    156162        $(MAKE) -r -C doxygen clean
     163        $(MAKE) -r -C tools/xcw/demo clean
    157164
    158165$(ERRNO_HEADER): $(ERRNO_INPUT)

  • tools/xcw/bin/helenos-bld-config

    r5c03bd30 ra5c468e  
    11#!/bin/bash
    22#
    3 # Copyright (c) 2015 Jiri Svoboda
     3# Copyright (c) 2018 Jiri Svoboda
    44# All rights reserved.
    55#
    … …  
    3535MAKEFILE_COMMON="$SRC_ROOT"/Makefile.common
    3636MAKEFILE_CONFIG="$SRC_ROOT"/Makefile.config
     37CONFIG_MK="$SRC_ROOT"/uspace/export/config.mk
    3738
    3839# Extract simple 'name = value' variable definition from Makefile
    … …  
    4243        file_name="$2"
    4344
    44         sed -n "s/^$field_name = \\(.*\\)$/\\1/p" "$file_name"
     45        sed -n "s/^$field_name \\{0,1\\}= \\{0,1\\}\\(.*\\)$/\\1/p" "$file_name" | \
     46            sed "s/^\"//" | sed "s/\"$//"
    4547}
    4648
    … …  
    5456        echo "__${ENDIAN}__"
    5557        ;;
     58*.--cflags) extract_field "HELENOS_CFLAGS" "$CONFIG_MK";;
     59*.--ldflags) extract_field "HELENOS_LDFLAGS" "$CONFIG_MK";;
    5660(*)
    5761        echo "Unknown option $1" >&2

  • tools/xcw/bin/helenos-cc

    r5c03bd30 ra5c468e  
    11#!/bin/bash
    22#
    3 # Copyright (c) 2015 Jiri Svoboda
     3# Copyright (c) 2018 Jiri Svoboda
    44# All rights reserved.
    55#
    … …  
    3636UARCH="$("$XCW"/helenos-bld-config --uarch)"
    3737CC="$("$XCW"/helenos-bld-config --cc)"
     38CFLAGS="$("$XCW"/helenos-bld-config --cflags)"
    3839ENDIAN="$("$XCW"/helenos-bld-config --endian)"
    3940
    … …  
    4142"$CC" \
    4243    -O3 -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32LE -finput-charset=UTF-8 \
    43     -nostdlib \
     44    $CFLAGS \
    4445    -Wall -Wextra -Wno-clobbered -Wno-unused-parameter -Wmissing-prototypes \
    4546    -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings -ggdb \

  • tools/xcw/bin/helenos-ld

    r5c03bd30 ra5c468e  
    11#!/bin/bash
    22#
    3 # Copyright (c) 2015 Jiri Svoboda
     3# Copyright (c) 2018 Jiri Svoboda
    44# All rights reserved.
    55#
    … …  
    3535SRC_ROOT="$XCW/../../.."
    3636UARCH="$("$XCW"/helenos-bld-config --uarch)"
     37CFLAGS="$("$XCW"/helenos-bld-config --cflags)"
     38LDFLAGS="$("$XCW"/helenos-bld-config --ldflags)"
    3739CC="$("$XCW"/helenos-bld-config --cc)"
    3840
    3941echo helenos-ld "$@"
    4042"$CC" \
     43    $CFLAGS \
    4144    "$@" \
    4245    "$SRC_ROOT"/uspace/lib/c/crt0.o \
    4346    "$SRC_ROOT"/uspace/lib/c/crt1.o \
    44     "$SRC_ROOT"/uspace/lib/c/libc.a
     47    "$SRC_ROOT"/uspace/lib/c/libc.a \
     48    -lgcc

  • uspace/Makefile

    r5c03bd30 ra5c468e  
    278278        find lib app drv srv -name '*.lo' -follow -exec rm \{\} \;
    279279        find lib app drv srv -name '*.d' -follow -exec rm \{\} \;
     280        rm -fr export
    280281
    281282$(CLEANS):
Note: See TracChangeset for help on using the changeset viewer.