| author | |
| committer | |
| log | 27cd830ec8ca1ddba692c65e8a129a2b5c9a1673 |
| tree | 6ccb379fb2076e33adee1323700c722c4dbe341f |
| parent | b59c65e9864e20ec88ebb0c3e9e9d38d4aa2e1fc |
* Add iOS C int sizes... try to hack in iOS DebugInfo
* Get rid of ios link check for now
* Remove macos linkversion check
3 files changed, 17 insertions(+), 12 deletions(-)
src/link.cpp-10| ... | @@ -1562,16 +1562,6 @@ static void construct_linker_job_macho(LinkJob *lj) { | ... | @@ -1562,16 +1562,6 @@ static void construct_linker_job_macho(LinkJob *lj) { |
| 1562 | lj->args.append("dynamic_lookup"); | 1562 | lj->args.append("dynamic_lookup"); |
| 1563 | } | 1563 | } |
| 1564 | 1564 | ||
| 1565 | if (platform.kind == MacOS) { | ||
| 1566 | if (darwin_version_lt(&platform, 10, 5)) { | ||
| 1567 | lj->args.append("-lgcc_s.10.4"); | ||
| 1568 | } else if (darwin_version_lt(&platform, 10, 6)) { | ||
| 1569 | lj->args.append("-lgcc_s.10.5"); | ||
| 1570 | } | ||
| 1571 | } else { | ||
| 1572 | zig_panic("TODO"); | ||
| 1573 | } | ||
| 1574 | |||
| 1575 | for (size_t i = 0; i < g->darwin_frameworks.length; i += 1) { | 1565 | for (size_t i = 0; i < g->darwin_frameworks.length; i += 1) { |
| 1576 | lj->args.append("-framework"); | 1566 | lj->args.append("-framework"); |
| 1577 | lj->args.append(buf_ptr(g->darwin_frameworks.at(i))); | 1567 | lj->args.append(buf_ptr(g->darwin_frameworks.at(i))); |
src/target.cpp+16-1| ... | @@ -894,10 +894,25 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) { | ... | @@ -894,10 +894,25 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) { |
| 894 | case CIntTypeCount: | 894 | case CIntTypeCount: |
| 895 | zig_unreachable(); | 895 | zig_unreachable(); |
| 896 | } | 896 | } |
| 897 | case OsIOS: | ||
| 898 | switch (id) { | ||
| 899 | case CIntTypeShort: | ||
| 900 | case CIntTypeUShort: | ||
| 901 | return 16; | ||
| 902 | case CIntTypeInt: | ||
| 903 | case CIntTypeUInt: | ||
| 904 | return 32; | ||
| 905 | case CIntTypeLong: | ||
| 906 | case CIntTypeULong: | ||
| 907 | case CIntTypeLongLong: | ||
| 908 | case CIntTypeULongLong: | ||
| 909 | return 64; | ||
| 910 | case CIntTypeCount: | ||
| 911 | zig_unreachable(); | ||
| 912 | } | ||
| 897 | case OsAnanas: | 913 | case OsAnanas: |
| 898 | case OsCloudABI: | 914 | case OsCloudABI: |
| 899 | case OsDragonFly: | 915 | case OsDragonFly: |
| 900 | case OsIOS: | ||
| 901 | case OsKFreeBSD: | 916 | case OsKFreeBSD: |
| 902 | case OsLv2: | 917 | case OsLv2: |
| 903 | case OsSolaris: | 918 | case OsSolaris: |
std/debug.zig+1-1| ... | @@ -1178,7 +1178,7 @@ pub const DwarfInfo = struct { | ... | @@ -1178,7 +1178,7 @@ pub const DwarfInfo = struct { |
| 1178 | }; | 1178 | }; |
| 1179 | 1179 | ||
| 1180 | pub const DebugInfo = switch (builtin.os) { | 1180 | pub const DebugInfo = switch (builtin.os) { |
| 1181 | builtin.Os.macosx => struct { | 1181 | builtin.Os.macosx, builtin.Os.ios => struct { |
| 1182 | symbols: []const MachoSymbol, | 1182 | symbols: []const MachoSymbol, |
| 1183 | strings: []const u8, | 1183 | strings: []const u8, |
| 1184 | ofiles: OFileTable, | 1184 | ofiles: OFileTable, |