| author |  emekoi <emekankurumeh@outlook.com> 2019-08-01 17:51:53-05:00 |
| committer | emekoi <emekankurumeh@outlook.com> 2019-08-02 19:32:46-05:00 |
| log | f15ec9a59b777a2b7998518858f11f5da0dfcb2d |
| tree | a43c1ce2cb326a6e27c294951a1f22c513768fe9 |
| parent | e68fee39847712f9316628e6efe8daa8fc13a5a5 |
implemented runtime abi detetction for windows
3 files changed, 32 insertions(+), 18 deletions(-)
src/os.cpp+16-16
| ... | ... | @@ -1125,29 +1125,27 @@ Error os_get_cwd(Buf *out_cwd) { |
| 1125 | 1125 | #endif |
| 1126 | 1126 | } |
| 1127 | 1127 | |
| 1128 | #if defined(ZIG_OS_WINDOWS) | |
| 1129 | 1128 | #define is_wprefix(s, prefix) \ |
| 1130 | 1129 | (wcsncmp((s), (prefix), sizeof(prefix) / sizeof(WCHAR) - 1) == 0) |
| 1131 | static bool is_stderr_cyg_pty(void) { | |
| 1132 | HANDLE stderr_handle = GetStdHandle(STD_ERROR_HANDLE); | |
| 1133 | if (stderr_handle == INVALID_HANDLE_VALUE) | |
| 1130 | bool ATTRIBUTE_MUST_USE os_is_cygwin_pty(int fd) { | |
| 1131 | #if defined(ZIG_OS_WINDOWS) | |
| 1132 | HANDLE handle = (HANDLE)_get_osfhandle(fd); | |
| 1133 | ||
| 1134 | // Cygwin/msys's pty is a pipe. | |
| 1135 | if (handle == INVALID_HANDLE_VALUE || GetFileType(handle) != FILE_TYPE_PIPE) { | |
| 1134 | 1136 | return false; |
| 1137 | } | |
| 1135 | 1138 | |
| 1136 | 1139 | int size = sizeof(FILE_NAME_INFO) + sizeof(WCHAR) * MAX_PATH; |
| 1137 | FILE_NAME_INFO *nameinfo; | |
| 1138 | 1140 | WCHAR *p = NULL; |
| 1139 | ||
| 1140 | // Cygwin/msys's pty is a pipe. | |
| 1141 | if (GetFileType(stderr_handle) != FILE_TYPE_PIPE) { | |
| 1142 | return 0; | |
| 1143 | } | |
| 1144 | nameinfo = (FILE_NAME_INFO *)allocate<char>(size); | |
| 1141 | ||
| 1142 | FILE_NAME_INFO *nameinfo = (FILE_NAME_INFO *)allocate<char>(size); | |
| 1145 | 1143 | if (nameinfo == NULL) { |
| 1146 | return 0; | |
| 1144 | return false; | |
| 1147 | 1145 | } |
| 1148 | 1146 | // Check the name of the pipe: |
| 1149 | 1147 | // '\{cygwin,msys}-XXXXXXXXXXXXXXXX-ptyN-{from,to}-master' |
| 1150 | if (GetFileInformationByHandleEx(stderr_handle, FileNameInfo, nameinfo, size)) { | |
| 1148 | if (GetFileInformationByHandleEx(handle, FileNameInfo, nameinfo, size)) { | |
| 1151 | 1149 | nameinfo->FileName[nameinfo->FileNameLength / sizeof(WCHAR)] = L'\0'; |
| 1152 | 1150 | p = nameinfo->FileName; |
| 1153 | 1151 | if (is_wprefix(p, L"\\cygwin-")) { /* Cygwin */ |
| ... | ... | @@ -1180,12 +1178,14 @@ static bool is_stderr_cyg_pty(void) { |
| 1180 | 1178 | } |
| 1181 | 1179 | free(nameinfo); |
| 1182 | 1180 | return (p != NULL); |
| 1183 | } | |
| 1181 | #else | |
| 1182 | return false | |
| 1184 | 1183 | #endif |
| 1184 | } | |
| 1185 | 1185 | |
| 1186 | 1186 | bool os_stderr_tty(void) { |
| 1187 | 1187 | #if defined(ZIG_OS_WINDOWS) |
| 1188 | return _isatty(_fileno(stderr)) != 0 || is_stderr_cyg_pty(); | |
| 1188 | return _isatty(_fileno(stderr)) != 0 || os_is_cygwin_pty(_fileno(stderr)); | |
| 1189 | 1189 | #elif defined(ZIG_OS_POSIX) |
| 1190 | 1190 | return isatty(STDERR_FILENO) != 0; |
| 1191 | 1191 | #else |
| ... | ... | @@ -1486,7 +1486,7 @@ WORD original_console_attributes = FOREGROUND_RED|FOREGROUND_GREEN|FOREGROUND_BL |
| 1486 | 1486 | |
| 1487 | 1487 | void os_stderr_set_color(TermColor color) { |
| 1488 | 1488 | #if defined(ZIG_OS_WINDOWS) |
| 1489 | if (is_stderr_cyg_pty()) { | |
| 1489 | if (os_stderr_tty()) { | |
| 1490 | 1490 | set_color_posix(color); |
| 1491 | 1491 | return; |
| 1492 | 1492 | } |
src/os.hpp+3
| ... | ... | @@ -11,6 +11,7 @@ |
| 11 | 11 | #include "list.hpp" |
| 12 | 12 | #include "buffer.hpp" |
| 13 | 13 | #include "error.hpp" |
| 14 | #include "target.hpp" | |
| 14 | 15 | #include "zig_llvm.h" |
| 15 | 16 | #include "windows_sdk.h" |
| 16 | 17 | |
| ... | ... | @@ -152,6 +153,8 @@ Error ATTRIBUTE_MUST_USE os_get_win32_ucrt_include_path(ZigWindowsSDK *sdk, Buf |
| 152 | 153 | Error ATTRIBUTE_MUST_USE os_get_win32_ucrt_lib_path(ZigWindowsSDK *sdk, Buf *output_buf, ZigLLVM_ArchType platform_type); |
| 153 | 154 | Error ATTRIBUTE_MUST_USE os_get_win32_kern32_path(ZigWindowsSDK *sdk, Buf *output_buf, ZigLLVM_ArchType platform_type); |
| 154 | 155 | |
| 156 | bool ATTRIBUTE_MUST_USE os_is_cygwin_pty(int fd); | |
| 157 | ||
| 155 | 158 | Error ATTRIBUTE_MUST_USE os_self_exe_shared_libs(ZigList<Buf *> &paths); |
| 156 | 159 | |
| 157 | 160 | #endif |
src/target.cpp+13-2
| ... | ... | @@ -506,7 +506,7 @@ void get_native_target(ZigTarget *target) { |
| 506 | 506 | &oformat); |
| 507 | 507 | target->os = get_zig_os_type(os_type); |
| 508 | 508 | target->is_native = true; |
| 509 | if (target->abi == ZigLLVM_UnknownEnvironment) { | |
| 509 | if (target->os == OsWindows || target->abi == ZigLLVM_UnknownEnvironment) { | |
| 510 | 510 | target->abi = target_default_abi(target->arch, target->os); |
| 511 | 511 | } |
| 512 | 512 | if (target_is_glibc(target)) { |
| ... | ... | @@ -1504,6 +1504,16 @@ bool target_is_single_threaded(const ZigTarget *target) { |
| 1504 | 1504 | return target_is_wasm(target); |
| 1505 | 1505 | } |
| 1506 | 1506 | |
| 1507 | static ZigLLVM_EnvironmentType target_get_win32_abi() { | |
| 1508 | FILE* files[] = { stdin, stdout, stderr, nullptr }; | |
| 1509 | for (int i = 0; files[i] != nullptr; i++) { | |
| 1510 | if (os_is_cygwin_pty(_fileno(files[i]))) { | |
| 1511 | return ZigLLVM_GNU; | |
| 1512 | } | |
| 1513 | } | |
| 1514 | return ZigLLVM_MSVC; | |
| 1515 | } | |
| 1516 | ||
| 1507 | 1517 | ZigLLVM_EnvironmentType target_default_abi(ZigLLVM_ArchType arch, Os os) { |
| 1508 | 1518 | if (arch == ZigLLVM_wasm32 || arch == ZigLLVM_wasm64) { |
| 1509 | 1519 | return ZigLLVM_Musl; |
| ... | ... | @@ -1544,8 +1554,9 @@ ZigLLVM_EnvironmentType target_default_abi(ZigLLVM_ArchType arch, Os os) { |
| 1544 | 1554 | case OsHurd: |
| 1545 | 1555 | return ZigLLVM_GNU; |
| 1546 | 1556 | case OsUefi: |
| 1547 | case OsWindows: | |
| 1548 | 1557 | return ZigLLVM_MSVC; |
| 1558 | case OsWindows: | |
| 1559 | return target_get_win32_abi(); | |
| 1549 | 1560 | case OsLinux: |
| 1550 | 1561 | case OsWASI: |
| 1551 | 1562 | return ZigLLVM_Musl; |