Changeset 2483f28 in mainline

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:

971849b1

Parents:

d27a505e

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-07-04 12:49:24)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)

Message:

Some clang fixes

Files:

• kernel/meson.build (modified) (1 diff)
• meson.build (modified) (3 diffs)
• meson/cross/amd64_clang (modified) (1 diff)

kernel/meson.build

@@ -70 +70 @@
         '-ffreestanding',
         # TODO: remove this flag
-        '-Wno-cast-function-type',
+        cc.get_supported_arguments([ '-Wno-cast-function-type' ]),
 ]
 

meson.build

@@ -255 +255 @@
 
         '-Wwrite-strings',
-        '-Wsystem-headers',
         '-Wunknown-pragmas',
 
@@ -267 +266 @@
         '-fdebug-prefix-map=' + meson.source_root() + '=.',
 ]
+
+if cc.get_id() != 'clang'
+        # Clang's own headers emit macro redefinition warnings.
+        extra_common_flags += '-Wsystem-headers'
+endif
 
 if UARCH != 'ia64'
@@ -450 +454 @@
 
 if CONFIG_DEVEL_FILES
-        # Also install libgcc
-        libgcc = run_command(
-                cc.cmd_array(), arch_uspace_c_args, '-print-libgcc-file-name',
+        # Also install libgcc.
+        # We have to explicitly use gcc for this, because clang only prints
+        # file name instead of whole path.
+        libgcc = run_command(cc_arch + '-helenos-gcc',
+                arch_uspace_c_args, '-print-libgcc-file-name',
                 check: true,
         ).stdout().strip()

meson/cross/amd64_clang

@@ -15 +15 @@
 has_function_printf = true
 needs_exe_wrapper = true
+c_args = [ '-nostdlibinc' ]
+cpp_args = [ '-nostdlibinc' ]
+link_args = [ '-nostdlib' ]
 
 cc_arch = 'amd64'