diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-09-13 14:11:00 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-09-13 14:11:00 -0400 |
| commit | 187a6d198fd06dfedbb121aa5a79791b34b24794 (patch) | |
| tree | 774caf931a1c0b89698a5ef37dbb1912247182ee /src/target.cpp | |
| parent | eb7d36ae0d240b8ef5421703e613d164cf691d8d (diff) | |
| parent | c15e464320ebb8c64ae19005e44ba5cb711f83c6 (diff) | |
| download | zig-187a6d198fd06dfedbb121aa5a79791b34b24794.tar.gz zig-187a6d198fd06dfedbb121aa5a79791b34b24794.zip | |
Merge branch 'nrdmn-uefi'
closes #2944
Diffstat (limited to 'src/target.cpp')
| -rw-r--r-- | src/target.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/target.cpp b/src/target.cpp index b87ecbe256..5376686548 100644 --- a/src/target.cpp +++ b/src/target.cpp @@ -1110,7 +1110,7 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) { } bool target_allows_addr_zero(const ZigTarget *target) { - return target->os == OsFreestanding; + return target->os == OsFreestanding || target->os == OsUefi; } const char *target_o_file_ext(const ZigTarget *target) { @@ -1535,12 +1535,12 @@ bool target_supports_fpic(const ZigTarget *target) { } bool target_supports_stack_probing(const ZigTarget *target) { - return target->os != OsWindows && (target->arch == ZigLLVM_x86 || target->arch == ZigLLVM_x86_64); + return target->os != OsWindows && target->os != OsUefi && (target->arch == ZigLLVM_x86 || target->arch == ZigLLVM_x86_64); } bool target_requires_pic(const ZigTarget *target, bool linking_libc) { // This function returns whether non-pic code is completely invalid on the given target. - return target->os == OsWindows || target_os_requires_libc(target->os) || + return target->os == OsWindows || target->os == OsUefi || target_os_requires_libc(target->os) || (linking_libc && target_is_glibc(target)); } |
