Changes in meson/arch/arm64/meson.build [a73a1453:c89ae25] in mainline

File:

• meson/arch/arm64/meson.build (modified) (4 diffs)

meson/arch/arm64/meson.build

@@ -1 +1 @@
 #
+# Copyright (c) 2021 Jiri Svoboda
 # Copyright (c) 2015 Petr Pavlu
 # All rights reserved.
@@ -27 +28 @@
 #
 
-arch_uspace_c_args = [ '-D__LE__', '-fno-omit-frame-pointer' ]
+arch_uspace_c_args = [
+        '-D__LE__',
+        '-fno-omit-frame-pointer',
+        cc.get_supported_arguments(['-mno-outline-atomics']),
+]
 arch_kernel_c_args = arch_uspace_c_args + [ '-march=armv8-a+nofp+nosimd', '-mgeneral-regs-only' ]
 arch_kernel_link_args = [ '-nostdlib' ]
 arch_uspace_link_args = [ '-nostdlib', '-lgcc' ]
-
 
 # UEFI binaries should be relocatable, the EFI boot service LoadImage() will
@@ -43 +47 @@
 # processor is in the execution mode that has unaligned access enabled. The
 # -mstrict-align option is therefore not needed.
-arch_boot_c_args = arch_uspace_c_args + [ '-fpic', '-fvisibility=hidden', '-fno-function-sections' ]
-arch_boot_link_args = [ '-Wl,-shared', '-Wl,--no-gc-sections' ]
-
+arch_boot_c_args = arch_uspace_c_args + [ '-fpic', '-fvisibility=hidden' ]
+arch_boot_link_args = [ '-Wl,-shared' ] + ldflags_ignore_rwx_segments
 
 if MACHINE == 'virt'
-        rd_essential += [
+        rd_essential_drv += [
                 'drv/char/pl011',
                 'drv/intctl/gicv2',
@@ -54 +57 @@
         ]
 endif
+
+if MACHINE == 'hikey960'
+        rd_essential_drv += [
+                'drv/char/pl011',
+                'drv/intctl/gicv2',
+                'drv/platform/hikey960',
+        ]
+endif
+
+rd_drv += rd_essential_drv