Merge "Add riscv64 to the map files."
diff --git a/libc/kernel/tools/clean_header.py b/libc/kernel/tools/clean_header.py
index cfd301a..f15fab4 100755
--- a/libc/kernel/tools/clean_header.py
+++ b/libc/kernel/tools/clean_header.py
@@ -109,9 +109,6 @@
if arch and arch in kernel_default_arch_macros:
macros.update(kernel_default_arch_macros[arch])
- if arch and arch in kernel_arch_token_replacements:
- blocks.replaceTokens(kernel_arch_token_replacements[arch])
-
blocks.removeStructs(kernel_structs_to_remove)
blocks.optimizeMacros(macros)
blocks.optimizeIf01()
diff --git a/libc/kernel/tools/defaults.py b/libc/kernel/tools/defaults.py
index 5fe907c..6ad0a32 100644
--- a/libc/kernel/tools/defaults.py
+++ b/libc/kernel/tools/defaults.py
@@ -63,12 +63,6 @@
"x86": {},
}
-kernel_arch_token_replacements = {
- "arm": {},
- "arm64": {},
- "x86": {},
- }
-
# Replace tokens in the output according to this mapping.
kernel_token_replacements = {
# The kernel usage of __unused for unused struct fields conflicts with the macro defined in <sys/cdefs.h>.
diff --git a/libc/versioner-dependencies/riscv64/kernel_uapi_asm-riscv64 b/libc/versioner-dependencies/riscv64/kernel_uapi_asm-riscv64
new file mode 120000
index 0000000..61353cb
--- /dev/null
+++ b/libc/versioner-dependencies/riscv64/kernel_uapi_asm-riscv64
@@ -0,0 +1 @@
+../../kernel/uapi/asm-riscv/
\ No newline at end of file
diff --git a/tools/generate-version-script.py b/tools/generate-version-script.py
index def621e..206b91b 100755
--- a/tools/generate-version-script.py
+++ b/tools/generate-version-script.py
@@ -8,7 +8,7 @@
import sys
def has_arch_tags(tags):
- for arch in ["arm", "arm64", "x86", "x86_64"]:
+ for arch in ["arm", "arm64", "riscv", "x86", "x86_64"]:
if arch in tags:
return True
return False