Changeset 63660a3 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:
41408d94
Parents:
2c38a55b
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-26 14:31:18)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)
Message:

shuffle some variables around

Files:
8 added
35 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r2c38a55b r63660a3  
    6262
    6363CROSS_PATH = $(shell dirname "$(CC)")
     64
     65ifeq ($(MACHINE),bmalta)
     66        UARCH = mips32eb
     67endif
    6468
    6569.PHONY: all precheck cscope cscope_parts autotool config_default config distclean clean check releasefile release common export-posix space

  • kernel/arch/amd64/meson.build

    r2c38a55b r63660a3  
    2727# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828#
    29 
    30 # TODO: Red Zone is only a problem if we allow interrupts to land on an active
    31 #       stack. Using separate stack for interrupts and ensuring that we never
    32 #       enable interrupts on an interrupt stack would allow us to get rid of
    33 #       the argument.
    34 
    35 kernel_c_args += [ '-mno-sse', '-mno-sse2', '-mcmodel=' + MEMORY_MODEL, '-mno-red-zone', '-fno-unwind-tables', '-fno-omit-frame-pointer' ]
    36 
    37 # TODO: fix this
    38 kernel_link_args += [ '-Wl,--no-gc-sections' ]
    39 
    40 if PROCESSOR == 'opteron'
    41         kernel_c_args += '-march=opteron'
    42 endif
    4329
    4430arch_src += files(

  • kernel/arch/arm32/meson.build

    r2c38a55b r63660a3  
    2626# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727#
    28 
    29 
    30 atsign = '%'
    31 
    32 kernel_c_args += [ '-fno-omit-frame-pointer', '-mapcs-frame', '-mno-unaligned-access', '-mfpu=vfpv3' ]
    33 
    34 if CONFIG_FPU
    35         # This is necessary to allow vmsr insn and fpexc manipulation
    36         # Use vfp32 to allow context save/restore of d16-d31 regs.
    37         kernel_c_args += [ '-mfloat-abi=hard' ]
    38 endif
    3928
    4029arch_src += files(

  • kernel/arch/arm64/meson.build

    r2c38a55b r63660a3  
    2626# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727#
    28 
    29 kernel_c_args += [ '-fno-omit-frame-pointer', '-march=armv8-a+nofp+nosimd', '-mgeneral-regs-only' ]
    3028
    3129arch_src += files(

  • kernel/arch/ia32/meson.build

    r2c38a55b r63660a3  
    2626# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727#
    28 
    29 kernel_c_args += [ '-mno-mmx', '-mno-sse', '-mno-sse2', '-mno-sse3', '-mno-3dnow' ]
    30 
    31 # TODO: fix this
    32 kernel_link_args += [ '-Wl,--no-gc-sections' ]
    3328
    3429arch_src += files(

  • kernel/arch/ia64/meson.build

    r2c38a55b r63660a3  
    2727# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828#
    29 
    30 kernel_c_args += [ '-mconstant-gp', '-fno-unwind-tables', '-mfixed-range=f32-f127' ]
    31 kernel_link_args += [ '-Wl,-EL' ]
    3229
    3330arch_src += files(
    … …  
    6057endif
    6158
    62 if MACHINE == 'i460GX'
    63         kernel_c_args += [ '-DI460GX' ]
    64 endif
    6559
    6660_check_headers = [

  • kernel/arch/mips32/meson.build

    r2c38a55b r63660a3  
    2626# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727#
    28 
    29 kernel_c_args += [
    30         '-msoft-float',
    31         '-mno-abicalls',
    32         '-G', '0',
    33         '-fno-zero-initialized-in-bss',
    34         '-mabi=32',
    35 ]
    36 
    37 as_prolog = '.module softfloat;'
    3828
    3929arch_src += files(
    … …  
    7161endif
    7262
     63
    7364_check_headers = [
    7465        'include/arch/istate_struct.h',

  • kernel/arch/ppc32/meson.build

    r2c38a55b r63660a3  
    2727#
    2828
    29 # FIXME: enable gc-sections
    30 kernel_c_args += [ '-msoft-float', '-fno-function-sections' ]
    31 kernel_link_args += [ '-Wl,--no-check-sections', '-Wl,--no-gc-sections' ]
    32 
    3329arch_src += files(
    3430        'src/context.S',
    … …  
    5450)
    5551
     52
    5653_check_headers = [
    5754        'include/arch/istate_struct.h',

  • kernel/arch/riscv64/meson.build

    r2c38a55b r63660a3  
    2727#
    2828
    29 kernel_c_args += [ '-mcmodel=medany' ]
    30 
    3129arch_src += files(
    3230        'src/boot/boot.S',
    … …  
    4947)
    5048
     49
    5150_check_headers = [
    5251        'include/arch/istate_struct.h',

  • kernel/genarch/meson.build

    r2c38a55b r63660a3  
    164164
    165165genarch_src = []
    166 genarch_check_headers = []
    167166
    168167foreach f : _src

  • kernel/meson.build

    r2c38a55b r63660a3  
    11
    2 ## The at-sign
    3 #
    4 # The `atsign` variable holds the ASCII character representing the at-sign
    5 # ('@') used in various $(AS) constructs (e.g. @progbits). On architectures that
    6 # don't use '@' for starting a comment, `atsign` is merely '@'. However, on
    7 # those that do use it for starting a comment (e.g. arm32), `atsign` must be
    8 # defined as the percentile-sign ('%') in the architecture-dependent files.
    9 #
    10 atsign = '@'
    11 
    12 ## Some architectures need a particular string at the beginning of assembly files.
    13 as_prolog = ''
    14 
    15 kernel_c_args = []
    16 kernel_link_args = []
    17 kernel_includes = []
    182arch_src = []
    193
     4# Fills arch_src.
    205subdir('arch' / h_arch)
     6
     7# Defines genarch_src.
    218subdir('genarch')
     9
     10# Defines generic_src, instrumentable_src.
    2211subdir('generic')
     12
     13# Defines test_src
    2314subdir('test')
    2415
    … …  
    2718symtab_section = '.section symtab.data, "a", ' + atsign + 'progbits;'
    2819
    29 kernel_includes += include_directories(
     20kernel_include_dirs = include_directories(
    3021        'generic/include',
    3122        'genarch/include',
    … …  
    4637]
    4738
     39# Preprocess linker script using C preprocessor.
    4840kernel_ldscript = custom_target('_link.ld',
    4941        input: 'arch' / h_arch / '_link.ld.in',
    … …  
    6355)
    6456
    65 kernel_link_args += [
     57kernel_link_args = arch_kernel_link_args + [
    6658        '-Wl,--nmagic',
    6759        '-T', meson.current_build_dir() / '_link.ld',
    … …  
    7365endif
    7466
    75 kernel_c_args += kernel_defs + [
     67kernel_c_args = arch_kernel_c_args + kernel_defs + [
    7668        '-ffreestanding',
    7769        # TODO: remove this flag
    … …  
    8880
    8981instrumentables = static_library('instrumentables', instrumentable_src,
    90         include_directories: kernel_includes,
     82        include_directories: kernel_include_dirs,
    9183        implicit_include_directories: false,
    9284        c_args: kernel_c_args + (CONFIG_TRACE ? [ '-finstrument-functions' ] : []),
    … …  
    9587
    9688noninstrumentables = static_library('noninstrumentables', arch_src, genarch_src, generic_src, test_src,
    97         include_directories: kernel_includes,
     89        include_directories: kernel_include_dirs,
    9890        implicit_include_directories: false,
    9991        c_args: kernel_c_args,
    … …  
    129121        output: 'empty_map.S',
    130122        capture: true,
    131         command: [ 'echo', as_prolog + symtab_section ],
     123        command: [ 'echo', kernel_as_prolog + symtab_section ],
    132124)
    133125
    … …  
    139131
    140132        kernel_elf = executable(kernel_name + '.elf', kernel_map_S,
    141                 include_directories: kernel_includes,
     133                include_directories: kernel_include_dirs,
    142134                implicit_include_directories: false,
    143135                c_args: kernel_c_args,
    … …  
    170162                        output: kernel_map_S_name,
    171163                        capture: true,
    172                         command: [ 'echo', as_prolog + symtab_section + ' .incbin "@INPUT@"' ],
     164                        command: [ 'echo', kernel_as_prolog + symtab_section + ' .incbin "@INPUT@"' ],
    173165                )
    174166        endif

  • meson.build

    r2c38a55b r63660a3  
    173173)
    174174
    175 if h_arch == 'arm32'
    176         add_project_arguments(
    177                 '-mcpu=' + '-'.join(PROCESSOR.split('_')),
    178                 CONFIG_FPU ? '-mfloat-abi=hard' : [],
    179                 language : [ 'c', 'cpp' ],
    180         )
    181 
    182         add_project_link_arguments(
    183                 '-mcpu=' + '-'.join(PROCESSOR.split('_')),
    184                 CONFIG_FPU ? '-mfloat-abi=hard' : [],
    185                 language : [ 'c', 'cpp' ],
    186         )
    187 
    188 elif h_arch == 'ia32'
    189 # FIXME: enabling -march for uspace makes malloc tests crash. Investigate.
    190 
    191 #       if PROCESSOR == 'core'
    192 #               # FIXME
    193 #               add_project_arguments('-march=prescott', language : [ 'c', 'cpp' ])
    194 #               add_project_link_arguments('-march=prescott', language : [ 'c', 'cpp' ])
    195 #       else
    196 #               add_project_arguments('-march=' + '-'.join(PROCESSOR.split('_')), language : [ 'c', 'cpp' ])
    197 #               add_project_link_arguments('-march=' + '-'.join(PROCESSOR.split('_')), language : [ 'c', 'cpp' ])
    198 #       endif
    199 
    200 elif h_arch == 'mips32'
    201 
    202         if MACHINE == 'msim'
    203                 add_project_arguments('-march=r4000', language : [ 'c', 'cpp' ])
    204                 add_project_link_arguments('-march=r4000', language : [ 'c', 'cpp' ])
    205 
    206         elif MACHINE == 'bmalta'
    207                 add_project_arguments('-march=4kc', language : [ 'c', 'cpp' ])
    208                 add_project_link_arguments('-march=4kc', language : [ 'c', 'cpp' ])
    209 
    210         elif MACHINE == 'lmalta'
    211                 add_project_arguments('-march=4kc', language : [ 'c', 'cpp' ])
    212                 add_project_link_arguments('-march=4kc', language : [ 'c', 'cpp' ])
    213 
    214         else
    215                 error('Unknown machine')
    216 
    217         endif
    218 
    219 elif h_arch == 'ppc32'
    220 
    221         if CONFIG_FPU
    222                 float = '-mhard-float'
    223         else
    224                 float = '-msoft-float'
    225         endif
    226 
    227         add_project_arguments(float, language : [ 'c', 'cpp' ])
    228         add_project_link_arguments(float, language : [ 'c', 'cpp' ])
    229 
    230 endif
    231 
    232175# TODO: enable more warnings
    233176# FIXME: -fno-builtin-strftime works around seemingly spurious format warning.
    … …  
    310253endforeach
    311254
     255# Init binaries.
     256rd_init = [
     257        'app/init',
     258        'srv/bd/rd',
     259        'srv/fs/' + RDFMT,
     260        'srv/loader',
     261        'srv/locsrv',
     262        'srv/logger',
     263        'srv/ns',
     264        'srv/vfs',
     265]
     266
     267# Binaries allowed on the initrd image when CONFIG_BAREBONE is enabled.
     268rd_essential = rd_init + [
     269        'app/bdsh',
     270        'app/getterm',
     271        'app/kio',
     272
     273        'srv/devman',
     274        'srv/fs/locfs',
     275        'srv/hid/input',
     276        'srv/hid/output',
     277        'srv/hid/compositor',
     278        'srv/hid/console',
     279        'srv/klog',
     280
     281        'drv/root/root',
     282        'drv/root/virt',
     283        'drv/fb/kfb',
     284]
     285
     286if CONFIG_FB
     287        rd_essential += [
     288                'app/vlaunch',
     289                'app/vterm',
     290        ]
     291endif
     292
     293
     294## The at-sign
     295#
     296# The `atsign` variable holds the ASCII character representing the at-sign
     297# ('@') used in various $(AS) constructs (e.g. @progbits). On architectures that
     298# don't use '@' for starting a comment, `atsign` is merely '@'. However, on
     299# those that do use it for starting a comment (e.g. arm32), `atsign` must be
     300# defined as the percentile-sign ('%') in the architecture-dependent files.
     301#
     302atsign = '@'
     303
     304## Some architectures need a particular string at the beginning of assembly files.
     305kernel_as_prolog = ''
     306uspace_as_prolog = ''
     307
     308subdir('meson' / 'arch' / h_arch)
     309
    312310subdir('kernel')
    313311subdir('uspace')
    … …  
    351349        'HELENOS_CROSS_PATH' : cc_path,
    352350        'HELENOS_ARCH' : cc_arch,
    353         'HELENOS_CFLAGS' : ' '.join(meson.get_cross_property('c_args')),
    354         'HELENOS_CXXFLAGS' : ' '.join(meson.get_cross_property('cpp_args')),
     351        'HELENOS_CFLAGS' : ' '.join(arch_uspace_c_args),
     352        'HELENOS_CXXFLAGS' : ' '.join(arch_uspace_c_args),
    355353        'HELENOS_CPPFLAGS' : ' '.join(export_cppflags),
    356354        'HELENOS_LDFLAGS' : ' '.join(export_ldflags),

  • meson/cross/amd64

    r2c38a55b r63660a3  
    1616needs_exe_wrapper = true
    1717
    18 c_args = [ '-D__LE__', '-fno-omit-frame-pointer' ]
    19 cpp_args = [ '-D__LE__', '-fno-omit-frame-pointer', '-fno-exceptions' ]
    20 c_link_args = [ '-nostdlib', '-lgcc', '-Wl,-z,max-page-size=0x1000' ]
    21 cpp_link_args = [ '-nostdlib', '-lgcc', '-Wl,-z,max-page-size=0x1000' ]
    2218cc_arch = 'amd64'
    2319h_arch = 'amd64'

  • meson/cross/amd64_clang

    r2c38a55b r63660a3  
    1616needs_exe_wrapper = true
    1717
    18 c_args = [ '-D__LE__', '-fno-omit-frame-pointer' ]
    19 cpp_args = [ '-D__LE__', '-fno-omit-frame-pointer', '-fno-exceptions' ]
    20 c_link_args = [ '-nostdlib', '-lgcc', '-Wl,-z,max-page-size=0x1000' ]
    21 cpp_link_args = [ '-nostdlib', '-lgcc', '-Wl,-z,max-page-size=0x1000' ]
    2218cc_arch = 'amd64'
    2319h_arch = 'amd64'

  • meson/cross/arm32

    r2c38a55b r63660a3  
    1515has_function_printf = true
    1616needs_exe_wrapper = true
    17 c_args = [ '-D__LE__', '-fno-omit-frame-pointer', '-mapcs-frame', '-ffixed-r9', '-mtp=soft' ]
    18 cpp_args = [ '-D__LE__', '-fno-omit-frame-pointer', '-mapcs-frame', '-ffixed-r9', '-mtp=soft', '-fno-exceptions' ]
    19 c_link_args = [ '-nostdlib', '-lgcc', '-Wl,-z,max-page-size=0x1000', '-mapcs-frame', '-ffixed-r9', '-mtp=soft' ]
    20 cpp_link_args = [ '-nostdlib', '-lgcc', '-Wl,-z,max-page-size=0x1000', '-mapcs-frame', '-ffixed-r9', '-mtp=soft', '-fno-exceptions' ]
     17
    2118cc_arch = 'arm'
    2219h_arch = 'arm32'

  • meson/cross/arm64

    r2c38a55b r63660a3  
    1515has_function_printf = true
    1616needs_exe_wrapper = true
    17 c_args = [ '-D__LE__', '-fno-omit-frame-pointer' ]
    18 cpp_args = [ '-D__LE__', '-fno-omit-frame-pointer', '-fno-exceptions' ]
    19 c_link_args = [ '-nostdlib', '-lgcc' ]
    20 cpp_link_args = [ '-nostdlib', '-lgcc', '-fno-exceptions' ]
     17
    2118cc_arch = 'aarch64'
    2219h_arch = 'arm64'

  • meson/cross/ia32

    r2c38a55b r63660a3  
    1616needs_exe_wrapper = true
    1717
    18 c_args = [ '-D__LE__', '-mno-tls-direct-seg-refs', '-fno-omit-frame-pointer' ]
    19 cpp_args = [ '-D__LE__', '-mno-tls-direct-seg-refs', '-fno-omit-frame-pointer', '-fno-exceptions' ]
    20 c_link_args = [ '-nostdlib', '-lgcc', '-mno-tls-direct-seg-refs' ]
    21 cpp_link_args = [ '-nostdlib', '-lgcc', '-mno-tls-direct-seg-refs' ]
    2218cc_arch = 'i686'
    2319h_arch = 'ia32'

  • meson/cross/ia64

    r2c38a55b r63660a3  
    1616needs_exe_wrapper = true
    1717
    18 c_args = [ '-D__LE__', '-fno-unwind-tables' ]
    19 cpp_args = [ '-D__LE__', '-fno-unwind-tables', '-fno-exceptions' ]
    20 c_link_args = [ '-nostdlib', '-lgcc' ]
    21 cpp_link_args = [ '-nostdlib', '-lgcc' ]
    2218cc_arch = 'ia64'
    2319h_arch = 'ia64'

  • meson/cross/mips32

    r2c38a55b r63660a3  
    1616needs_exe_wrapper = true
    1717
    18 c_args = [ '-D__LE__', '-fno-omit-frame-pointer', '-msoft-float', '-mabi=32' ]
    19 cpp_args = [ '-D__LE__', '-fno-omit-frame-pointer', '-msoft-float', '-mabi=32', '-fno-exceptions' ]
    20 c_link_args = [ '-nostdlib', '-lgcc', '-msoft-float', '-mabi=32' ]
    21 cpp_link_args = [ '-nostdlib', '-lgcc', '-msoft-float', '-mabi=32' ]
    2218cc_arch = 'mipsel'
    2319h_arch = 'mips32'

  • meson/cross/mips32eb

    r2c38a55b r63660a3  
    1616needs_exe_wrapper = true
    1717
    18 c_args = [ '-D__BE__', '-fno-omit-frame-pointer', '-msoft-float', '-mabi=32' ]
    19 cpp_args = [ '-D__BE__', '-fno-omit-frame-pointer', '-msoft-float', '-mabi=32', '-fno-exceptions' ]
    20 c_link_args = [ '-nostdlib', '-lgcc', '-msoft-float', '-mabi=32' ]
    21 cpp_link_args = [ '-nostdlib', '-lgcc', '-msoft-float', '-mabi=32' ]
    2218cc_arch = 'mips'
    2319h_arch = 'mips32'

  • meson/cross/ppc32

    r2c38a55b r63660a3  
    1616needs_exe_wrapper = true
    1717
    18 c_args = [ '-D__BE__', '-fno-omit-frame-pointer', '-m32', '-Wa,-a32', '-mcpu=powerpc' ]
    19 cpp_args = [ '-D__BE__', '-fno-omit-frame-pointer', '-m32', '-Wa,-a32', '-mcpu=powerpc', '-fno-exceptions' ]
    20 c_link_args = [ '-nostdlib', '-lgcc', '-m32', '-Wl,-z,max-page-size=0x1000' ]
    21 cpp_link_args = [ '-nostdlib', '-lgcc', '-m32', '-Wl,-z,max-page-size=0x1000' ]
    2218cc_arch = 'ppc'
    2319h_arch = 'ppc32'

  • meson/cross/riscv64

    r2c38a55b r63660a3  
    1616needs_exe_wrapper = true
    1717
    18 c_args = [ '-D__LE__', '-fno-omit-frame-pointer' ]
    19 cpp_args = [ '-D__LE__', '-fno-omit-frame-pointer', '-fno-exceptions' ]
    20 c_link_args = [ '-nostdlib', '-lgcc' ]
    21 cpp_link_args = [ '-nostdlib', '-lgcc' ]
    2218cc_arch = 'riscv64'
    2319h_arch = 'riscv64'

  • uspace/app/barber/meson.build

    r2c38a55b r63660a3  
    3737        input : _images,
    3838        output : [ 'images.zip' ],
    39         command : [ mkarray, '@OUTDIR@', 'images', 'image', as_prolog, '.data', '@INPUT@' ],
     39        command : [ mkarray, '@OUTDIR@', 'images', 'image', uspace_as_prolog, '.data', '@INPUT@' ],
    4040)
    4141_imgs_s = custom_target('barber_images.s',

  • uspace/app/vlaunch/meson.build

    r2c38a55b r63660a3  
    66        input : _images,
    77        output : [ 'images.zip' ],
    8         command : [ mkarray, '@OUTDIR@', 'images', 'image', as_prolog, '.data', '@INPUT@' ],
     8        command : [ mkarray, '@OUTDIR@', 'images', 'image', uspace_as_prolog, '.data', '@INPUT@' ],
    99)
    1010_imgs_s = custom_target('vlaunch_images.s',

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

    r2c38a55b r63660a3  
    1414
    1515arch_start_src = files('src/crt0.S')
    16 
    17 rd_essential += [
    18         'app/edit',
    19         'app/mixerctl',
    20         'app/wavplay',
    21 
    22         'srv/audio/hound',
    23 
    24         'drv/intctl/apic',
    25         'drv/intctl/i8259',
    26         'drv/platform/pc',
    27         'drv/block/ata_bd',
    28         'drv/bus/pci/pciintel',
    29         'drv/bus/isa',
    30         'drv/audio/sb16',
    31         'drv/char/i8042',
    32         'drv/hid/ps2mouse',
    33         'drv/hid/xtkbd',
    34 ]

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

    r2c38a55b r63660a3  
    1414
    1515arch_start_src = files('src/crt0.S')
    16 
    17 if MACHINE == 'gta02'
    18         rd_essential += [
    19                 'srv/hid/s3c24xx_ts',
    20                 'srv/hw/char/s3c24xx_uart',
    21         ]
    22 
    23 elif MACHINE == 'beagleboardxm' or MACHINE == 'beaglebone'
    24         rd_essential += [
    25                 'drv/platform/amdm37x',
    26                 'drv/fb/amdm37x_dispc',
    27         ]
    28 
    29 elif MACHINE == 'integratorcp'
    30         rd_essential += [
    31                 'drv/char/pl050',
    32                 'drv/hid/atkbd',
    33                 'drv/hid/ps2mouse',
    34                 'drv/intctl/icp-ic',
    35                 'drv/platform/icp',
    36         ]
    37 endif
    38 
    39 rd_essential += [
    40         'drv/bus/usb/ehci',
    41         'drv/bus/usb/ohci',
    42         'drv/bus/usb/usbdiag',
    43         'drv/bus/usb/usbflbk',
    44         'drv/bus/usb/usbhub',
    45         'drv/bus/usb/usbmid',
    46         'drv/block/usbmast',
    47         'drv/hid/usbhid',
    48 ]

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

    r2c38a55b r63660a3  
    1212
    1313arch_start_src = files('src/crt0.S')
    14 
    15 if MACHINE == 'virt'
    16         rd_essential += [
    17                 'drv/char/pl011',
    18                 'drv/intctl/gicv2',
    19                 'drv/platform/arm64virt',
    20         ]
    21 endif

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

    r2c38a55b r63660a3  
    1414
    1515arch_start_src = files('src/crt0.S')
    16 
    17 if MACHINE == 'bmalta' or MACHINE == 'lmalta'
    18         rd_essential += [
    19                 'drv/platform/malta',
    20                 'drv/intctl/i8259',
    21                 'drv/block/ata_bd',
    22                 'drv/bus/pci/pciintel',
    23                 'drv/bus/isa',
    24                 'drv/char/i8042',
    25                 'drv/char/ns8250',
    26                 'drv/hid/ps2mouse',
    27                 'drv/hid/xtkbd',
    28         ]
    29 
    30 elif MACHINE == 'msim'
    31         rd_essential += [
    32                 'drv/platform/msim',
    33                 'drv/block/ddisk',
    34                 'drv/char/msim-con',
    35         ]
    36 
    37 endif

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

    r2c38a55b r63660a3  
    1515
    1616arch_start_src = files('src/crt0.S')
    17 
    18 if MACHINE == 'i460GX'
    19         rd_essential += [
    20                 'drv/platform/pc',
    21                 'drv/bus/pci/pciintel',
    22                 'drv/bus/isa',
    23                 'drv/char/i8042',
    24                 'drv/hid/xtkbd',
    25         ]
    26 
    27 elif MACHINE == 'ski'
    28         rd_essential += [
    29                 'drv/char/ski-con',
    30                 'drv/platform/ski',
    31         ]
    32 
    33 endif

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

    r2c38a55b r63660a3  
    1111)
    1212
    13 as_prolog = '.module softfloat;.abicalls;'
    14 
    1513arch_start_src = files('src/crt0.S')
    16 
    17 if MACHINE == 'bmalta' or MACHINE == 'lmalta'
    18         rd_essential += [
    19                 'drv/platform/malta',
    20                 'drv/intctl/i8259',
    21                 'drv/block/ata_bd',
    22                 'drv/bus/pci/pciintel',
    23                 'drv/bus/isa',
    24                 'drv/char/i8042',
    25                 'drv/char/ns8250',
    26                 'drv/hid/ps2mouse',
    27                 'drv/hid/xtkbd',
    28         ]
    29 
    30 elif MACHINE == 'msim'
    31         rd_essential += [
    32                 'drv/platform/msim',
    33                 'drv/block/ddisk',
    34                 'drv/char/msim-con',
    35         ]
    36 
    37 endif

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

    r2c38a55b r63660a3  
    1414
    1515arch_start_src = files('src/crt0.S')
    16 
    17 rd_essential += [
    18         'drv/platform/mac',
    19         'drv/bus/adb/cuda_adb',
    20         'drv/bus/pci/pciintel',
    21         'drv/bus/usb/ohci',
    22         'drv/bus/usb/usbdiag',
    23         'drv/bus/usb/usbflbk',
    24         'drv/bus/usb/usbhub',
    25         'drv/bus/usb/usbmid',
    26         'drv/bus/usb/vhc',
    27         'drv/block/usbmast',
    28         'drv/hid/adb-kbd',
    29         'drv/hid/adb-mouse',
    30         'drv/hid/usbhid',
    31 ]

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

    r2c38a55b r63660a3  
    1111
    1212arch_start_src = files('src/crt0.c')
    13 
    14 rd_essential += [
    15 ]

  • uspace/lib/c/meson.build

    r2c38a55b r63660a3  
    211211libstartfiles = static_library('startfiles', start_src,
    212212        include_directories: includes,
    213         c_args: c_args,
     213        c_args: arch_uspace_c_args + c_args,
    214214        install: CONFIG_DEVEL_FILES,
    215215        install_dir: 'lib',

  • uspace/lib/meson.build

    r2c38a55b r63660a3  
    11always_static = (get_option('default_library') == 'static')
    2 
    3 # Redefined in libarch, if necessary.
    4 # Used in a few places where we generate custom assembly.
    5 as_prolog = ''
    62
    73# Which libraries are installed when CONFIG_DEVEL_FILES is enabled
    … …  
    173169                                include_directories: [ private_includes, includes ],
    174170                                dependencies: _shared_deps,
    175                                 c_args: c_args,
    176                                 link_args: link_args,
     171                                c_args: arch_uspace_c_args + c_args,
     172                                cpp_args: arch_uspace_c_args + c_args,
     173                                link_args: arch_uspace_c_args + arch_uspace_link_args + link_args,
    177174                                version: version,
    178175                                build_by_default: true,
    … …  
    207204                        include_directories: [ private_includes, includes ],
    208205                        dependencies: _include_deps,
    209                         c_args: c_args,
    210                         link_args: link_args,
     206                        c_args: arch_uspace_c_args + c_args,
     207                        cpp_args: arch_uspace_c_args + c_args,
    211208                        install: install_static_lib,
    212209                        install_dir: 'lib',
    … …  
    295292                install: true,
    296293                install_dir: 'test',
    297                 link_args: _ldargs,
     294                c_args: arch_uspace_c_args,
     295                cpp_args: arch_uspace_c_args,
     296                link_args: arch_uspace_c_args + arch_uspace_link_args + _ldargs,
    298297        )
    299298

  • uspace/meson.build

    r2c38a55b r63660a3  
    77install_debug_files = false
    88
    9 rd_essential = []
    10 
    119subdir('lib')
    1210subdir('app')
    1311subdir('srv')
    1412subdir('drv')
    15 
    16 init = [
    17         'app/init',
    18         'srv/bd/rd',
    19         'srv/fs/' + RDFMT,
    20         'srv/loader',
    21         'srv/locsrv',
    22         'srv/logger',
    23         'srv/ns',
    24         'srv/vfs',
    25 ]
    26 
    27 rd_essential += init
    28 
    29 rd_essential += [
    30         'app/bdsh',
    31         'app/getterm',
    32         'app/kio',
    33 
    34         'srv/devman',
    35         'srv/fs/locfs',
    36         'srv/hid/input',
    37         'srv/hid/output',
    38         'srv/hid/compositor',
    39         'srv/hid/console',
    40         'srv/klog',
    41 
    42         'drv/root/root',
    43         'drv/root/virt',
    44         'drv/fb/kfb',
    45 ]
    46 
    47 if CONFIG_FB
    48         rd_essential += [
    49                 'app/vlaunch',
    50                 'app/vterm',
    51         ]
    52 endif
    5313
    5414dirs = []
    … …  
    11575
    11676        # Init binaries need to always be linked statically.
    117         static_build = (not CONFIG_USE_SHARED_LIBS) or init.contains(dir)
     77        static_build = (not CONFIG_USE_SHARED_LIBS) or rd_init.contains(dir)
    11878
    11979        # Add the corresponding standard libraries to dependencies.
    … …  
    202162                dependencies: tst.get('dependencies'),
    203163                objects: startfiles,
    204                 c_args: tst.get('c_args'),
    205                 link_args: _ldargs,
     164                c_args: arch_uspace_c_args + tst.get('c_args'),
     165                cpp_args: arch_uspace_c_args + tst.get('c_args'),
     166                link_args: arch_uspace_c_args + arch_uspace_link_args + _ldargs,
    206167                implicit_include_directories: false,
    207168                install: false,
Note: See TracChangeset for help on using the changeset viewer.