diff --git a/share/machdeps/machdep_gcc_x86_16.json b/share/machdeps/machdep_gcc_x86_16.json
index 5ec8ff10e5b76fac0365474430217df74c6dc7ef..d6dc63d3c14ec34049698ce595d345ebd50f3317 100644
--- a/share/machdeps/machdep_gcc_x86_16.json
+++ b/share/machdeps/machdep_gcc_x86_16.json
@@ -1,11 +1,11 @@
 {
-    "alignof_aligned": 16,
-    "alignof_double": 4,
-    "alignof_float": 4,
+    "alignof_aligned": 8,
+    "alignof_double": 8,
+    "alignof_float": 2,
     "alignof_fun": 1,
-    "alignof_int": 4,
+    "alignof_int": 2,
     "alignof_long": 4,
-    "alignof_longdouble": 4,
+    "alignof_longdouble": 16,
     "alignof_longlong": 4,
     "alignof_ptr": 4,
     "alignof_short": 2,
@@ -20,13 +20,13 @@
     "sizeof_double": 8,
     "sizeof_float": 4,
     "sizeof_fun": 1,
-    "sizeof_int": 4,
+    "sizeof_int": 2,
     "sizeof_long": 4,
-    "sizeof_longdouble": 12,
+    "sizeof_longdouble": 16,
     "sizeof_longlong": 8,
     "sizeof_ptr": 4,
     "sizeof_short": 2,
     "sizeof_void": 1,
-    "version": "gcc (GCC) 12.2.1 20230201",
-    "wchar_t": "long"
+    "version": "none",
+    "wchar_t": "int"
 }
diff --git a/share/machdeps/machdep_x86_16.json b/share/machdeps/machdep_x86_16.json
index 93ac4281b31a76a46b9316c9330f14f83c249b44..100978d6a5635c9bebad6e596552f01707865e0b 100644
--- a/share/machdeps/machdep_x86_16.json
+++ b/share/machdeps/machdep_x86_16.json
@@ -1,17 +1,17 @@
 {
-    "alignof_aligned": 16,
-    "alignof_double": 4,
-    "alignof_float": 4,
+    "alignof_aligned": 8,
+    "alignof_double": 8,
+    "alignof_float": 2,
     "alignof_fun": -1,
-    "alignof_int": 4,
+    "alignof_int": 2,
     "alignof_long": 4,
-    "alignof_longdouble": 4,
+    "alignof_longdouble": 16,
     "alignof_longlong": 4,
     "alignof_ptr": 4,
     "alignof_short": 2,
     "alignof_str": 1,
     "char_is_unsigned": false,
-    "compiler": "gcc",
+    "compiler": "generic",
     "cpp_arch_flags": "-m16",
     "has__builtin_va_list": true,
     "little_endian": true,
@@ -20,13 +20,13 @@
     "sizeof_double": 8,
     "sizeof_float": 4,
     "sizeof_fun": -1,
-    "sizeof_int": 4,
+    "sizeof_int": 2,
     "sizeof_long": 4,
-    "sizeof_longdouble": 12,
+    "sizeof_longdouble": 16,
     "sizeof_longlong": 8,
     "sizeof_ptr": 4,
     "sizeof_short": 2,
     "sizeof_void": -1,
-    "version": "gcc (GCC) 12.2.1 20230201",
-    "wchar_t": "long"
+    "version": "none",
+    "wchar_t": "int"
 }