Changeset dc5c303 in mainline for kernel/generic/meson.build

Timestamp:

2023-12-28T13:59:23Z (2 years ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (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:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

• kernel/generic/meson.build (modified) (4 diffs)

kernel/generic/meson.build

@@ -36 +36 @@
 
 generic_src += files(
-        'src/adt/bitmap.c',
-        'src/adt/hash_table.c',
-        'src/adt/list.c',
-        'src/adt/odict.c',
+        'common/adt/bitmap.c',
+        'common/adt/hash_table.c',
+        'common/adt/list.c',
+        'common/adt/odict.c',
+        'common/printf/printf_core.c',
+        'common/stdc/calloc.c',
+        'common/stdc/ctype.c',
+        'common/stdc/mem.c',
+        'common/gsort.c',
+        'common/str.c',
+        'common/str_error.c',
+        'common/strtol.c',
+
         'src/cap/cap.c',
         'src/console/chardev.c',
@@ -46 +55 @@
         'src/cpu/cpu_mask.c',
         'src/ddi/irq.c',
-        'src/debug/debug.c',
+        'src/debug/line.c',
+        'src/debug/names.c',
         'src/debug/panic.c',
+        'src/debug/profile.c',
+        'src/debug/sections.c',
         'src/debug/stacktrace.c',
         'src/debug/symtab.c',
+        'src/debug/util.c',
         'src/ipc/event.c',
         'src/ipc/ipc.c',
@@ -66 +79 @@
         'src/ipc/sysipc_ops.c',
         'src/lib/elf.c',
-        'src/lib/gsort.c',
         'src/lib/halt.c',
         'src/lib/mem.c',
-        'src/lib/memfnc.c',
         'src/lib/ra.c',
         'src/lib/rd.c',
-        'src/lib/str.c',
-        'src/lib/strtol.c',
-        'src/lib/str_error.c',
         'src/lib/ubsan.c',
         'src/log/log.c',
@@ -89 +97 @@
         'src/preempt/preemption.c',
         'src/printf/printf.c',
-        'src/printf/printf_core.c',
         'src/printf/snprintf.c',
         'src/printf/vprintf.c',