Changeset 41408d94 in mainline

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:

5f176da

Parents:

63660a3

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-26 20:18:37)

git-committer:

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

Message:

sparc64

Files:

• boot/arch/sparc64/Makefile.inc (modified) (1 diff)
• kernel/arch/sparc64/Makefile.inc (deleted)
• kernel/arch/sparc64/meson.build (added)
• kernel/genarch/meson.build (modified) (1 diff)
• kernel/meson.build (modified) (1 diff)
• meson.build (modified) (3 diffs)
• meson/arch/sparc64/meson.build (added)
• meson/cross/sparc64 (added)
• uspace/lib/c/arch/sparc64/Makefile.common (deleted)
• uspace/lib/c/arch/sparc64/meson.build (moved) (moved from uspace/lib/c/arch/sparc64/Makefile.inc ) (1 diff)

boot/arch/sparc64/Makefile.inc

@@ -38 +38 @@
 EXTRA_CFLAGS = -mcpu=ultrasparc -m64 -mno-fpu -mcmodel=medlow
 
-ifeq ($(PROCESSOR), sun4v)
-RD_DRVS_ESSENTIAL += \
-        platform/sun4v \
-        char/sun4v-con
-else
-RD_DRVS_ESSENTIAL += \
-        platform/sun4u \
-        bus/pci/pciintel \
-        bus/isa \
-        intctl/obio \
-        char/ns8250
-endif
-
 SOURCES = \
         arch/$(BARCH)/src/asm.S \

kernel/genarch/meson.build

@@ -142 +142 @@
 
 if CONFIG_OFW_PCI
-        _src += [ 'ofw/ebus.c', 'ofw/pci.c ', 'ofw/sbus.c', 'ofw/upa.c' ]
+        _src += [ 'ofw/ebus.c', 'ofw/pci.c', 'ofw/sbus.c', 'ofw/upa.c' ]
 endif
 

kernel/meson.build

@@ -43 +43 @@
         command: [
                 cc.cmd_array(),
+                arch_kernel_c_args,
                 kernel_defs,
                 '-I' + meson.current_source_dir() / 'arch' / h_arch / 'include',

meson.build

@@ -2 +2 @@
 # TODO: jobfile
 # TODO: lto
-# TODO: -D__$(ENDIANESS)__ in cross
 # TODO: CONFIG_BUILD_SHARED_LIBS
 # TODO: fix clang build
@@ -67 +66 @@
         'OPTIMIZATION',
         'PROCESSOR',
+        'QUADFLOAT',
         'RDFMT',
 
@@ -106 +106 @@
         'CONFIG_TEST',
         'CONFIG_TRACE',
+        'CONFIG_TSB',
         'CONFIG_UDEBUG',
         'CONFIG_VIA_CUDA',

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

@@ -27 +27 @@
 #
 
-ARCH_SOURCES = \
-        arch/$(UARCH)/src/entryjmp.S \
-        arch/$(UARCH)/src/thread_entry.S \
-        arch/$(UARCH)/src/fibril.S \
-        arch/$(UARCH)/src/tls.c \
-        arch/$(UARCH)/src/stacktrace.c \
-        arch/$(UARCH)/src/stacktrace_asm.S \
-        arch/$(UARCH)/src/rtld/dynamic.c \
-        arch/$(UARCH)/src/rtld/reloc.c
+arch_src += [ autocheck.process('include/libarch/fibril_context.h') ]
 
-ARCH_AUTOCHECK_HEADERS = \
-        arch/$(UARCH)/include/libarch/fibril_context.h
+arch_src += files(
+        'src/entryjmp.S',
+        'src/thread_entry.S',
+        'src/fibril.S',
+        'src/tls.c',
+        'src/stacktrace.c',
+        'src/stacktrace_asm.S',
+        'src/rtld/dynamic.c',
+        'src/rtld/reloc.c',
+)
+
+arch_start_src = files('src/crt0.S')