Changeset e28175d in mainline for meson/arch/arm64/meson.build

Timestamp:

2020-03-15T10:44:02Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

b401b33 (diff), 44dde42 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

heiducteam <tristanided@…> (2020-03-15 10:44:02)

git-committer:

GitHub <noreply@…> (2020-03-15 10:44:02)

Message:

Merge pull request #1 from HelenOS/master

sync

File:

• meson/arch/arm64/meson.build (moved) (moved from boot/arch/arm64/Makefile.inc ) (2 diffs)

meson/arch/arm64/meson.build

@@ -27 +27 @@
 #
 
-BOOT_OUTPUT = image.boot
-POST_OUTPUT = $(ROOT_PATH)/image.iso
-POSTBUILD = Makefile.grub
-GRUB_LOADER = chainloader
+arch_uspace_c_args = [ '-D__LE__', '-fno-omit-frame-pointer' ]
+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' ]
 
-BFD_NAME = elf64-littleaarch64
-# Request binary BFD output. The ARM64 port manually prepares the .text
-# section to look as a PE file than can be loaded on EFI systems.
-BFD_OUTPUT = binary
-BFD_ARCH = aarch64
-
-BITS = 64
-ENDIANESS = LE
 
 # UEFI binaries should be relocatable, the EFI boot service LoadImage() will
@@ -51 +43 @@
 # processor is in the execution mode that has unaligned access enabled. The
 # -mstrict-align option is therefore not needed.
-EXTRA_CFLAGS = -fpic -fvisibility=hidden
-EXTRA_LDFLAGS = -Wl,-shared
+arch_boot_c_args = arch_uspace_c_args + [ '-fpic', '-fvisibility=hidden', '-fno-function-sections' ]
+arch_boot_link_args = [ '-Wl,-shared', '-Wl,--no-gc-sections' ]
 
-ifeq ($(MACHINE), virt)
-        RD_DRVS_ESSENTIAL += \
-                char/pl011 \
-                intctl/gicv2 \
-                platform/arm64virt
+
+if MACHINE == 'virt'
+        rd_essential += [
+                'drv/char/pl011',
+                'drv/intctl/gicv2',
+                'drv/platform/arm64virt',
+        ]
 endif
-
-SOURCES = \
-        arch/$(BARCH)/src/asm.S \
-        arch/$(BARCH)/src/main.c \
-        arch/$(BARCH)/src/relocate.c \
-        $(COMPS).o \
-        genarch/src/efi.c \
-        generic/src/gzip.c \
-        generic/src/inflate.c \
-        generic/src/kernel.c \
-        generic/src/memstr.c \
-        generic/src/payload.c \
-        generic/src/printf.c \
-        generic/src/printf_core.c \
-        generic/src/str.c \
-        generic/src/tar.c \
-        generic/src/version.c \
-        generic/src/vprintf.c