Changeset 63660a3 in mainline for kernel/meson.build

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

File:

• kernel/meson.build (modified) (10 diffs)

kernel/meson.build

@@ -1 +1 @@
 
-## The at-sign
-#
-# The `atsign` variable holds the ASCII character representing the at-sign
-# ('@') used in various $(AS) constructs (e.g. @progbits). On architectures that
-# don't use '@' for starting a comment, `atsign` is merely '@'. However, on
-# those that do use it for starting a comment (e.g. arm32), `atsign` must be
-# defined as the percentile-sign ('%') in the architecture-dependent files.
-#
-atsign = '@'
-
-## Some architectures need a particular string at the beginning of assembly files.
-as_prolog = ''
-
-kernel_c_args = []
-kernel_link_args = []
-kernel_includes = []
 arch_src = []
 
+# Fills arch_src.
 subdir('arch' / h_arch)
+
+# Defines genarch_src.
 subdir('genarch')
+
+# Defines generic_src, instrumentable_src.
 subdir('generic')
+
+# Defines test_src
 subdir('test')
 
@@ -27 +18 @@
 symtab_section = '.section symtab.data, "a", ' + atsign + 'progbits;'
 
-kernel_includes += include_directories(
+kernel_include_dirs = include_directories(
         'generic/include',
         'genarch/include',
@@ -46 +37 @@
 ]
 
+# Preprocess linker script using C preprocessor.
 kernel_ldscript = custom_target('_link.ld',
         input: 'arch' / h_arch / '_link.ld.in',
@@ -63 +55 @@
 )
 
-kernel_link_args += [
+kernel_link_args = arch_kernel_link_args + [
         '-Wl,--nmagic',
         '-T', meson.current_build_dir() / '_link.ld',
@@ -73 +65 @@
 endif
 
-kernel_c_args += kernel_defs + [
+kernel_c_args = arch_kernel_c_args + kernel_defs + [
         '-ffreestanding',
         # TODO: remove this flag
@@ -88 +80 @@
 
 instrumentables = static_library('instrumentables', instrumentable_src,
-        include_directories: kernel_includes,
+        include_directories: kernel_include_dirs,
         implicit_include_directories: false,
         c_args: kernel_c_args + (CONFIG_TRACE ? [ '-finstrument-functions' ] : []),
@@ -95 +87 @@
 
 noninstrumentables = static_library('noninstrumentables', arch_src, genarch_src, generic_src, test_src,
-        include_directories: kernel_includes,
+        include_directories: kernel_include_dirs,
         implicit_include_directories: false,
         c_args: kernel_c_args,
@@ -129 +121 @@
         output: 'empty_map.S',
         capture: true,
-        command: [ 'echo', as_prolog + symtab_section ],
+        command: [ 'echo', kernel_as_prolog + symtab_section ],
 )
 
@@ -139 +131 @@
 
         kernel_elf = executable(kernel_name + '.elf', kernel_map_S,
-                include_directories: kernel_includes,
+                include_directories: kernel_include_dirs,
                 implicit_include_directories: false,
                 c_args: kernel_c_args,
@@ -170 +162 @@
                         output: kernel_map_S_name,
                         capture: true,
-                        command: [ 'echo', as_prolog + symtab_section + ' .incbin "@INPUT@"' ],
+                        command: [ 'echo', kernel_as_prolog + symtab_section + ' .incbin "@INPUT@"' ],
                 )
         endif