]> glassweightruler.freedombox.rocks Git - waydroid.git/commitdiff
arch: Fallback to arm on weird arm64 kernels with 32-bit userspace
authorJami Kettunen <jami.kettunen@protonmail.com>
Mon, 30 Jan 2023 00:19:28 +0000 (02:19 +0200)
committerAlessandro Astone <ales.astone@gmail.com>
Mon, 30 Jan 2023 20:34:09 +0000 (21:34 +0100)
Typically armv8l should catch these, but it seems some Android
downstream kernels at least cheat and don't report the correct thing.

tools/helpers/arch.py

index af18e668515bbfe92c482a3fbac330a79495b23e..735d344e17c773223b81c2b3702730f6969037af 100644 (file)
@@ -24,5 +24,7 @@ def maybe_remap(target):
             if "sse4_2" not in f.read():
                 logging.info("x86_64 CPU does not support SSE4.2, falling back to x86...")
                 return "x86"
             if "sse4_2" not in f.read():
                 logging.info("x86_64 CPU does not support SSE4.2, falling back to x86...")
                 return "x86"
+    elif target == "arm64" and platform.architecture()[0] == "32bit":
+        return "arm"
 
     return target
 
     return target