Changeset 5f176da in mainline for kernel

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:

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

Location:

kernel

Files:

• meson.build (modified) (4 diffs)
• test/meson.build (modified) (2 diffs)

kernel/meson.build

@@ -3 +3 @@
 
 # Fills arch_src.
-subdir('arch' / h_arch)
+subdir('arch' / KARCH)
 
 # Defines genarch_src.
@@ -21 +21 @@
         'generic/include',
         'genarch/include',
-        'arch' / h_arch / 'include',
-        '..' / 'abi' / 'arch' / h_arch / 'include',
+        'arch' / KARCH / 'include',
+        '..' / 'abi' / 'arch' / KARCH / 'include',
         '..' / 'abi' / 'include',
         'test',
@@ -39 +39 @@
 # Preprocess linker script using C preprocessor.
 kernel_ldscript = custom_target('_link.ld',
-        input: 'arch' / h_arch / '_link.ld.in',
+        input: 'arch' / KARCH / '_link.ld.in',
         output: '_link.ld',
         command: [
@@ -45 +45 @@
                 arch_kernel_c_args,
                 kernel_defs,
-                '-I' + meson.current_source_dir() / 'arch' / h_arch / 'include',
+                '-I' + meson.current_source_dir() / 'arch' / KARCH / 'include',
                 '-D__ASSEMBLER__',
                 '-D__LINKER__',

kernel/test/meson.build

@@ -24 +24 @@
         )
 
-        if h_arch == 'mips32'
+        if KARCH == 'mips32'
                 test_src += files('debug/mips1.c')
         else
@@ -30 +30 @@
         endif
 
-        if h_arch == 'ia64'
+        if KARCH == 'ia64'
                 test_src += files('mm/purge1.c')
         else