Don't use le32/le64

Makefile

@@ -1053,9 +1053,9 @@ $(BIN_DIR)/build_halide_h: $(ROOT_DIR)/tools/build_halide_h.cpp
 .SECONDARY:
 
 # Compile generic 32- or 64-bit code
-# (The 'nacl' is a red herring. This is just a generic 32-bit little-endian target.)
-RUNTIME_TRIPLE_32 = "le32-unknown-nacl-unknown"
-RUNTIME_TRIPLE_64 = "le64-unknown-unknown-unknown"
+# Don't be fooled: arm/aarch64 are just generic 32/64-bit targets for our purposes here
+RUNTIME_TRIPLE_32 = "arm-unknown-unknown-gnueabihf"
+RUNTIME_TRIPLE_64 = "aarch64-unknown-unknown-unknown"
 
 # Windows requires special handling.  The generic windows_* modules must have -fpic elided
 # and (for 64 bit) must set wchar to be 2 bytes.  The windows_*_x86 and windows_*_arm
@@ -1068,7 +1068,8 @@ RUNTIME_TRIPLE_WIN_X86_32 = "i386-unknown-windows-unknown"
 RUNTIME_TRIPLE_WIN_X86_64 = "x86_64-unknown-windows-unknown"
 RUNTIME_TRIPLE_WIN_ARM_32 = "arm-unknown-windows-unknown"
 RUNTIME_TRIPLE_WIN_ARM_64 = "aarch64-unknown-windows-unknown"
-RUNTIME_TRIPLE_WIN_GENERIC_64 = "le64-unknown-windows-unknown"
+# TODO: was le64 here, not sure if this is correct or not
+RUNTIME_TRIPLE_WIN_GENERIC_64 = "aarch64-unknown-windows-unknown"
 
 # `-fno-threadsafe-statics` is very important here (note that it allows us to use a 'modern' C++
 # standard but still skip threadsafe guards for static initialization in our runtime code)

src/runtime/CMakeLists.txt

@@ -217,17 +217,31 @@ foreach (i IN LISTS RUNTIME_CPP)
                     # unfortunately, clang doesn't automatically set this flag even though the
                     # ABI is msvc on windows
                     set(fshort-wchar -fshort-wchar)
-                    set(TARGET "le64-unknown-windows-unknown")
+                    if (LLVM_PACKAGE_VERSION VERSION_LESS 19.0)
+                        set(TARGET "le64-unknown-windows-unknown")
+                    else ()
+                        # TODO: was le64 here, not sure if this is correct or not
+                        set(TARGET "aarch64-unknown-windows-unknown")
+                    endif ()
                 endif ()
             endif()
         # Everything else
         else()
-            if (j EQUAL 32)
-                # (The 'nacl' is a red herring. This is just a generic 32-bit little-endian target.)
-                set(TARGET "le32-unknown-nacl-unknown")
+            if (LLVM_PACKAGE_VERSION VERSION_LESS 19.0)
+                if (j EQUAL 32)
+                    # generic 32-bit code
+                    set(TARGET "le32-unknown-nacl-unknown")
+                else ()
+                    # generic 64-bit code
+                    set(TARGET "le64-unknown-unknown-unknown")
+                endif ()
             else ()
-                # generic 64-bit code
-                set(TARGET "le64-unknown-unknown-unknown")
+                # don't be fooled: arm/aarch64 are just generic 32/64-bit targets for our purposes here
+                if (j EQUAL 32)
+                    set(TARGET "arm-unknown-unknown-gnueabihf")
+                else ()
+                    set(TARGET "aarch64-unknown-unknown-unknown")
+                endif ()
             endif ()
         endif ()