Changeset 63660a3 in mainline for kernel


Ignore:
Timestamp:
2019-08-17T12:49:43Z (6 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

Location:
kernel
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.