Changeset 5f176da in mainline for uspace

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:

uspace

Files:

• drv/meson.build (modified) (1 diff)
• lib/c/arch/riscv64/Makefile.inc (deleted)
• lib/c/arch/riscv64/meson.build (modified) (1 diff)
• lib/c/meson.build (modified) (2 diffs)
• srv/loader/meson.build (modified) (1 diff)

uspace/drv/meson.build

@@ -64 +64 @@
 
 # sun4u driver won't compile on 32-bit targets
-if h_arch == 'sparc64'
+if UARCH == 'sparc64'
         drvs += 'platform/sun4u'
 endif

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

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

uspace/lib/c/meson.build

@@ -1 +1 @@
 # libarch
 arch_src = []
-subdir(join_paths('arch', h_arch))
+subdir('arch' / UARCH)
 
 c_args = [ '-fno-builtin', '-D_LIBC_SOURCE' ]
@@ -9 +9 @@
 incdirs = [
         'include',
-        'arch' / h_arch / 'include',
-        root_path / 'abi' / 'arch' / h_arch / 'include',
+        'arch' / UARCH / 'include',
+        root_path / 'abi' / 'arch' / UARCH / 'include',
         root_path / 'abi' / 'include',
 ]

uspace/srv/loader/meson.build

@@ -1 +1 @@
 
-if h_arch == 'ia64'
+if UARCH == 'ia64'
         link_args += [ '-T', meson.current_source_dir() / 'elf64_ia64_loader.x' ]
 else