authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-03-25 21:32:43-04:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-03-25 21:32:55-04:00
log65f77878b4d37a2e179c90f5f0b2515d0901a43e
tree6ff9e58e5b1527405ba41c29ca4110a90a685548
parent14c0b8c54863a4f88ffc0e6a740998bc0ebe89d5

std: remove temporary workarounds for stage2_x86_64

These seem to work great now.

1 files changed, 6 insertions(+), 6 deletions(-)

lib/std/io.zig+6-6
...@@ -29,8 +29,8 @@ pub const default_mode: ModeOverride = if (is_async) Mode.evented else .blocking...@@ -29,8 +29,8 @@ pub const default_mode: ModeOverride = if (is_async) Mode.evented else .blocking
2929
30fn getStdOutHandle() os.fd_t {30fn getStdOutHandle() os.fd_t {
31 if (builtin.os.tag == .windows) {31 if (builtin.os.tag == .windows) {
32 if (builtin.zig_backend == .stage2_x86_64 or builtin.zig_backend == .stage2_aarch64) {32 if (builtin.zig_backend == .stage2_aarch64) {
33 // TODO: this is just a temporary workaround until we advance x86 backend further along.33 // TODO: this is just a temporary workaround until we advance aarch64 backend further along.
34 return os.windows.GetStdHandle(os.windows.STD_OUTPUT_HANDLE) catch os.windows.INVALID_HANDLE_VALUE;34 return os.windows.GetStdHandle(os.windows.STD_OUTPUT_HANDLE) catch os.windows.INVALID_HANDLE_VALUE;
35 }35 }
36 return os.windows.peb().ProcessParameters.hStdOutput;36 return os.windows.peb().ProcessParameters.hStdOutput;
...@@ -55,8 +55,8 @@ pub fn getStdOut() File {...@@ -55,8 +55,8 @@ pub fn getStdOut() File {
5555
56fn getStdErrHandle() os.fd_t {56fn getStdErrHandle() os.fd_t {
57 if (builtin.os.tag == .windows) {57 if (builtin.os.tag == .windows) {
58 if (builtin.zig_backend == .stage2_x86_64 or builtin.zig_backend == .stage2_aarch64) {58 if (builtin.zig_backend == .stage2_aarch64) {
59 // TODO: this is just a temporary workaround until we advance x86 backend further along.59 // TODO: this is just a temporary workaround until we advance aarch64 backend further along.
60 return os.windows.GetStdHandle(os.windows.STD_ERROR_HANDLE) catch os.windows.INVALID_HANDLE_VALUE;60 return os.windows.GetStdHandle(os.windows.STD_ERROR_HANDLE) catch os.windows.INVALID_HANDLE_VALUE;
61 }61 }
62 return os.windows.peb().ProcessParameters.hStdError;62 return os.windows.peb().ProcessParameters.hStdError;
...@@ -81,8 +81,8 @@ pub fn getStdErr() File {...@@ -81,8 +81,8 @@ pub fn getStdErr() File {
8181
82fn getStdInHandle() os.fd_t {82fn getStdInHandle() os.fd_t {
83 if (builtin.os.tag == .windows) {83 if (builtin.os.tag == .windows) {
84 if (builtin.zig_backend == .stage2_x86_64 or builtin.zig_backend == .stage2_aarch64) {84 if (builtin.zig_backend == .stage2_aarch64) {
85 // TODO: this is just a temporary workaround until we advance x86 backend further along.85 // TODO: this is just a temporary workaround until we advance aarch64 backend further along.
86 return os.windows.GetStdHandle(os.windows.STD_INPUT_HANDLE) catch os.windows.INVALID_HANDLE_VALUE;86 return os.windows.GetStdHandle(os.windows.STD_INPUT_HANDLE) catch os.windows.INVALID_HANDLE_VALUE;
87 }87 }
88 return os.windows.peb().ProcessParameters.hStdInput;88 return os.windows.peb().ProcessParameters.hStdInput;