Changeset 34120f10 in mainline for kernel/generic/meson.build

Timestamp:

2023-10-27T19:38:31Z (20 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master, topic/msim-upgrade, topic/simplify-dev-export

Children:

63ed840

Parents:

c89ae25 (diff), 694ca3d6 (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.

Message:

Merge code deduplication work

TL;DR: Added directory /common, which now contains the sole existing
copy of ADT, printf_core, and a few other pieces. Should make changes
to any of those less of a headache.

File:

• kernel/generic/meson.build (modified) (3 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',
@@ -70 +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',
@@ -93 +97 @@
         'src/preempt/preemption.c',
         'src/printf/printf.c',
-        'src/printf/printf_core.c',
         'src/printf/snprintf.c',
         'src/printf/vprintf.c',