Changes in meson/arch/arm32/meson.build [c21d4d6:2944b5a] in mainline

File:

• meson/arch/arm32/meson.build (modified) (6 diffs)

meson/arch/arm32/meson.build

@@ -1 +1 @@
 #
+# Copyright (c) 2021 Jiri Svoboda
 # Copyright (c) 2019 Jiří Zárevúcky
 # All rights reserved.
@@ -41 +42 @@
 ]
 
+arch_kernel_c_args = arch_uspace_c_args + [ '-mno-unaligned-access', '-mfpu=vfpv3' ]
+arch_kernel_c_args += cc.get_supported_arguments(['-mgeneral-regs-only' ])
+arch_kernel_link_args = [ '-nostdlib', '-Wl,-z,max-page-size=0x1000' ]
+
 if CONFIG_FPU
-        # This is necessary for kernel too, to allow vmsr insn and fpexc manipulation.
-        # Use vfp32 to allow context save/restore of d16-d31 regs.
-        arch_uspace_c_args += [ '-mfloat-abi=hard' ]
+    # Need to use softfp because our libgcc.a uses it too
+    # softfp - generate code with soft-float calling conventions but allow use
+    # of "hard" float instructions
+    arch_uspace_c_args += [ '-mfloat-abi=softfp' ]
 endif
-
-arch_kernel_c_args = arch_uspace_c_args + [ '-mno-unaligned-access', '-mfpu=vfpv3' ]
-arch_kernel_link_args = [ '-nostdlib', '-Wl,-z,max-page-size=0x1000' ]
 arch_uspace_link_args = [ '-nostdlib', '-lgcc', '-Wl,-z,max-page-size=0x1000' ]
 
@@ -54 +57 @@
 arch_boot_link_args = arch_kernel_link_args
 
-
-rd_essential += [
+rd_essential_drv += [
         'drv/bus/usb/ehci',
         'drv/bus/usb/ohci',
@@ -73 +75 @@
 
 elif MACHINE == 'beagleboardxm' or MACHINE == 'beaglebone'
-        rd_essential += [
+        rd_essential_drv += [
                 'drv/platform/amdm37x',
                 'drv/fb/amdm37x_dispc',
@@ -79 +81 @@
 
 elif MACHINE == 'integratorcp'
-        rd_essential += [
+        rd_essential_drv += [
                 'drv/char/pl050',
                 'drv/hid/atkbd',
@@ -87 +89 @@
         ]
 endif
+
+rd_drv += rd_essential_drv