Changeset 5f176da in mainline


Ignore:
Timestamp:
2019-08-17T12:49:43Z (5 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bc48242
Parents:
41408d94
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-26 20:32:16)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)
Message:

Pull *ARCH from config

Files:
1 deleted
19 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r41408d94 r5f176da  
    6363CROSS_PATH = $(shell dirname "$(CC)")
    6464
     65CROSS_TARGET ?= $(UARCH)
     66
    6567ifeq ($(MACHINE),bmalta)
    66         UARCH = mips32eb
     68        CROSS_TARGET = mips32eb
    6769endif
    6870
    … …  
    7375
    7476$(BUILD_DIR)/build.ninja: Makefile.config version
    75         PATH="$(CROSS_PATH):$$PATH" meson . $(BUILD_DIR) --cross-file meson/cross/$(UARCH) $(MESON_ARGS)
     77        PATH="$(CROSS_PATH):$$PATH" meson . $(BUILD_DIR) --cross-file meson/cross/$(CROSS_TARGET) $(MESON_ARGS)
    7678
    7779common: $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(ERRNO_HEADER) $(BUILD_DIR)/build.ninja

  • kernel/meson.build

    r41408d94 r5f176da  
    33
    44# Fills arch_src.
    5 subdir('arch' / h_arch)
     5subdir('arch' / KARCH)
    66
    77# Defines genarch_src.
    … …  
    2121        'generic/include',
    2222        'genarch/include',
    23         'arch' / h_arch / 'include',
    24         '..' / 'abi' / 'arch' / h_arch / 'include',
     23        'arch' / KARCH / 'include',
     24        '..' / 'abi' / 'arch' / KARCH / 'include',
    2525        '..' / 'abi' / 'include',
    2626        'test',
    … …  
    3939# Preprocess linker script using C preprocessor.
    4040kernel_ldscript = custom_target('_link.ld',
    41         input: 'arch' / h_arch / '_link.ld.in',
     41        input: 'arch' / KARCH / '_link.ld.in',
    4242        output: '_link.ld',
    4343        command: [
    … …  
    4545                arch_kernel_c_args,
    4646                kernel_defs,
    47                 '-I' + meson.current_source_dir() / 'arch' / h_arch / 'include',
     47                '-I' + meson.current_source_dir() / 'arch' / KARCH / 'include',
    4848                '-D__ASSEMBLER__',
    4949                '-D__LINKER__',

  • kernel/test/meson.build

    r41408d94 r5f176da  
    2424        )
    2525
    26         if h_arch == 'mips32'
     26        if KARCH == 'mips32'
    2727                test_src += files('debug/mips1.c')
    2828        else
    … …  
    3030        endif
    3131
    32         if h_arch == 'ia64'
     32        if KARCH == 'ia64'
    3333                test_src += files('mm/purge1.c')
    3434        else

  • meson.build

    r41408d94 r5f176da  
    111111        'MACHINE',
    112112        'MEMORY_MODEL',
     113
     114        'UARCH',
     115        'KARCH',
    113116]
    114117
    … …  
    155158HELENOS_RELEASE = HELENOS_VERSION + '.' + HELENOS_PATCHLEVEL + '.' + HELENOS_SUBLEVEL
    156159
    157 h_arch = meson.get_cross_property('h_arch')
    158160
    159161meson.add_install_script('install.sh', CONFIG_DEVEL_FILES.to_string())
    … …  
    205207]
    206208
    207 if h_arch != 'ia64'
     209if UARCH != 'ia64'
    208210        extra_common_flags += [ '-fvar-tracking-assignments' ]
    209211endif
    … …  
    307309uspace_as_prolog = ''
    308310
    309 subdir('meson' / 'arch' / h_arch)
     311subdir('meson' / 'arch' / UARCH)
    310312
    311313subdir('kernel')

  • meson/cross/amd64

    r41408d94 r5f176da  
    1717
    1818cc_arch = 'amd64'
    19 h_arch = 'amd64'
    2019bits = 64
    2120

  • meson/cross/amd64_clang

    r41408d94 r5f176da  
    1717
    1818cc_arch = 'amd64'
    19 h_arch = 'amd64'
    2019bits = 64
    2120

  • meson/cross/arm32

    r41408d94 r5f176da  
    1717
    1818cc_arch = 'arm'
    19 h_arch = 'arm32'
    2019bits = 32
    2120

  • meson/cross/arm64

    r41408d94 r5f176da  
    1717
    1818cc_arch = 'aarch64'
    19 h_arch = 'arm64'
    2019bits = 64
    2120

  • meson/cross/ia32

    r41408d94 r5f176da  
    1717
    1818cc_arch = 'i686'
    19 h_arch = 'ia32'
    2019bits = 32
    2120

  • meson/cross/ia64

    r41408d94 r5f176da  
    1717
    1818cc_arch = 'ia64'
    19 h_arch = 'ia64'
    2019bits = 64
    2120

  • meson/cross/mips32

    r41408d94 r5f176da  
    1717
    1818cc_arch = 'mipsel'
    19 h_arch = 'mips32'
    2019bits = 32
    2120

  • meson/cross/mips32eb

    r41408d94 r5f176da  
    1717
    1818cc_arch = 'mips'
    19 h_arch = 'mips32'
    2019bits = 32
    2120

  • meson/cross/ppc32

    r41408d94 r5f176da  
    1717
    1818cc_arch = 'ppc'
    19 h_arch = 'ppc32'
    2019bits = 32
    2120

  • meson/cross/riscv64

    r41408d94 r5f176da  
    1717
    1818cc_arch = 'riscv64'
    19 h_arch = 'riscv64'
    2019bits = 64
    2120

  • meson/cross/sparc64

    r41408d94 r5f176da  
    1717
    1818cc_arch = 'sparc64'
    19 h_arch = 'sparc64'
    2019bits = 64
    2120

  • uspace/drv/meson.build

    r41408d94 r5f176da  
    6464
    6565# sun4u driver won't compile on 32-bit targets
    66 if h_arch == 'sparc64'
     66if UARCH == 'sparc64'
    6767        drvs += 'platform/sun4u'
    6868endif

  • uspace/lib/c/arch/riscv64/meson.build

    r41408d94 r5f176da  
     1#
     2# Copyright (c) 2016 Martin Decky
     3# All rights reserved.
     4#
     5# Redistribution and use in source and binary forms, with or without
     6# modification, are permitted provided that the following conditions
     7# are met:
     8#
     9# - Redistributions of source code must retain the above copyright
     10#   notice, this list of conditions and the following disclaimer.
     11# - Redistributions in binary form must reproduce the above copyright
     12#   notice, this list of conditions and the following disclaimer in the
     13#   documentation and/or other materials provided with the distribution.
     14# - The name of the author may not be used to endorse or promote products
     15#   derived from this software without specific prior written permission.
     16#
     17# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
     18# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
     19# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
     20# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
     21# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
     22# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
     23# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
     24# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     25# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
     26# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     27#
     28
    129arch_src += [ autocheck.process('include/libarch/fibril_context.h') ]
    230

  • uspace/lib/c/meson.build

    r41408d94 r5f176da  
    11# libarch
    22arch_src = []
    3 subdir(join_paths('arch', h_arch))
     3subdir('arch' / UARCH)
    44
    55c_args = [ '-fno-builtin', '-D_LIBC_SOURCE' ]
    … …  
    99incdirs = [
    1010        'include',
    11         'arch' / h_arch / 'include',
    12         root_path / 'abi' / 'arch' / h_arch / 'include',
     11        'arch' / UARCH / 'include',
     12        root_path / 'abi' / 'arch' / UARCH / 'include',
    1313        root_path / 'abi' / 'include',
    1414]

  • uspace/srv/loader/meson.build

    r41408d94 r5f176da  
    11
    2 if h_arch == 'ia64'
     2if UARCH == 'ia64'
    33        link_args += [ '-T', meson.current_source_dir() / 'elf64_ia64_loader.x' ]
    44else
Note: See TracChangeset for help on using the changeset viewer.