| ... | ... | @@ -32,7 +32,7 @@ static const NativeArch native_arch = NativeArchArm; |
| 32 | 32 | static const NativeArch native_arch = NativeArchi386; |
| 33 | 33 | #elif defined(_M_X64) || defined(__x86_64__) |
| 34 | 34 | static const NativeArch native_arch = NativeArchx86_64; |
| 35 | | #elif defined(__aarch64__) |
| 35 | #elif defined(_M_ARM64) || defined(__aarch64__) |
| 36 | 36 | static const NativeArch native_arch = NativeArchAarch64; |
| 37 | 37 | #else |
| 38 | 38 | #error unsupported architecture |
| ... | ... | @@ -120,8 +120,7 @@ static ZigFindWindowsSdkError find_msvc_lib_dir(ZigWindowsSDKPrivate *priv) { |
| 120 | 120 | out_append_ptr += sprintf(out_append_ptr, "arm\\"); |
| 121 | 121 | break; |
| 122 | 122 | case NativeArchAarch64: |
| 123 | | // TODO: is this right? |
| 124 | | out_append_ptr += sprintf(out_append_ptr, "aarch64\\"); |
| 123 | out_append_ptr += sprintf(out_append_ptr, "arm64\\"); |
| 125 | 124 | break; |
| 126 | 125 | } |
| 127 | 126 | sprintf(tmp_buf, "%s%s", output_path, "vcruntime.lib"); |
| ... | ... | @@ -169,8 +168,7 @@ com_done:; |
| 169 | 168 | tmp_buf_append_ptr += sprintf(tmp_buf_append_ptr, "arm\\"); |
| 170 | 169 | break; |
| 171 | 170 | case NativeArchAarch64: |
| 172 | | // TODO: is this right? |
| 173 | | tmp_buf_append_ptr += sprintf(tmp_buf_append_ptr, "aarch64\\"); |
| 171 | tmp_buf_append_ptr += sprintf(tmp_buf_append_ptr, "arm64\\"); |
| 174 | 172 | break; |
| 175 | 173 | } |
| 176 | 174 | |
| ... | ... | @@ -216,7 +214,6 @@ static ZigFindWindowsSdkError find_10_version(ZigWindowsSDKPrivate *priv) { |
| 216 | 214 | option_name = "OptionId.DesktopCPParm"; |
| 217 | 215 | break; |
| 218 | 216 | case NativeArchAarch64: |
| 219 | | // TODO: is this right? |
| 220 | 217 | option_name = "OptionId.DesktopCPParm64"; |
| 221 | 218 | break; |
| 222 | 219 | case NativeArchx86_64: |
Jonathan Marler <johnnymarler@gmail.com> 2021-09-07 21:49:08-06:00