commit 60bf36be004390ffb7dd17b578a89771034d95bd
author Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 05 19:30:05 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 05 19:30:05 2022 +0000
tree 51f7ac34c4fb8990eca6509aa16f72efefa1101b
parent 02cbe531e31831cd7f86c670220aae158dc5b284
parent 0a3442526b432bcf2f6be0d8fa77e587df8c228c

Merge "Tell the version script generation script about risc-v."

libc/kernel/tools/clean_header.py

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()

libc/kernel/tools/defaults.py

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>.