authorgravatar for emekankurumeh@outlook.comemekoi <emekankurumeh@outlook.com> 2019-03-29 19:25:47-05:00
committergravatar for emekankurumeh@outlook.comemekoi <emekankurumeh@outlook.com> 2019-04-04 19:51:55-05:00
logecd2332bb5c74739ade40f1b9eaf412b4642a36f
tree20f3ce5831f0c565541d6a1da190bef6d80649bd
parent8e6ff8d615820f7f732724a5db1639ae5f12fb4e

made lld flags on windows consistent

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

src/link.cpp+23-23
......@@ -1122,14 +1122,14 @@ static bool zig_lld_link(ZigLLVM_ObjectFormatType oformat, const char **args, si
11221122}
11231123
11241124static void add_uefi_link_args(LinkJob *lj) {
1125 lj->args.append("/BASE:0");
1126 lj->args.append("/ENTRY:EfiMain");
1127 lj->args.append("/OPT:REF");
1128 lj->args.append("/SAFESEH:NO");
1129 lj->args.append("/MERGE:.rdata=.data");
1130 lj->args.append("/ALIGN:32");
1131 lj->args.append("/NODEFAULTLIB");
1132 lj->args.append("/SECTION:.xdata,D");
1125 lj->args.append("-BASE:0");
1126 lj->args.append("-ENTRY:EfiMain");
1127 lj->args.append("-OPT:REF");
1128 lj->args.append("-SAFESEH:NO");
1129 lj->args.append("-MERGE:.rdata=.data");
1130 lj->args.append("-ALIGN:32");
1131 lj->args.append("-NODEFAULTLIB");
1132 lj->args.append("-SECTION:.xdata,D");
11331133}
11341134
11351135static void add_nt_link_args(LinkJob *lj, bool is_library) {
......@@ -1163,12 +1163,12 @@ static void add_nt_link_args(LinkJob *lj, bool is_library) {
11631163 lj->args.append("kernel32.lib");
11641164 lj->args.append("ntdll.lib");
11651165 } else {
1166 lj->args.append("/NODEFAULTLIB");
1166 lj->args.append("-NODEFAULTLIB");
11671167 if (!is_library) {
11681168 if (g->have_winmain) {
1169 lj->args.append("/ENTRY:WinMain");
1169 lj->args.append("-ENTRY:WinMain");
11701170 } else {
1171 lj->args.append("/ENTRY:WinMainCRTStartup");
1171 lj->args.append("-ENTRY:WinMainCRTStartup");
11721172 }
11731173 }
11741174 }
......@@ -1178,17 +1178,17 @@ static void construct_linker_job_coff(LinkJob *lj) {
11781178 Error err;
11791179 CodeGen *g = lj->codegen;
11801180
1181 lj->args.append("/ERRORLIMIT:0");
1181 lj->args.append("-ERRORLIMIT:0");
11821182
1183 lj->args.append("/NOLOGO");
1183 lj->args.append("-NOLOGO");
11841184
11851185 if (!g->strip_debug_symbols) {
1186 lj->args.append("/DEBUG");
1186 lj->args.append("-DEBUG");
11871187 }
11881188
11891189 if (g->out_type == OutTypeExe) {
11901190 // TODO compile time stack upper bound detection
1191 lj->args.append("/STACK:16777216");
1191 lj->args.append("-STACK:16777216");
11921192 }
11931193
11941194 coff_append_machine_arg(g, &lj->args);
......@@ -1203,35 +1203,35 @@ static void construct_linker_job_coff(LinkJob *lj) {
12031203 }
12041204 break;
12051205 case TargetSubsystemConsole:
1206 lj->args.append("/SUBSYSTEM:console");
1206 lj->args.append("-SUBSYSTEM:console");
12071207 add_nt_link_args(lj, is_library);
12081208 break;
12091209 case TargetSubsystemEfiApplication:
1210 lj->args.append("/SUBSYSTEM:efi_application");
1210 lj->args.append("-SUBSYSTEM:efi_application");
12111211 add_uefi_link_args(lj);
12121212 break;
12131213 case TargetSubsystemEfiBootServiceDriver:
1214 lj->args.append("/SUBSYSTEM:efi_boot_service_driver");
1214 lj->args.append("-SUBSYSTEM:efi_boot_service_driver");
12151215 add_uefi_link_args(lj);
12161216 break;
12171217 case TargetSubsystemEfiRom:
1218 lj->args.append("/SUBSYSTEM:efi_rom");
1218 lj->args.append("-SUBSYSTEM:efi_rom");
12191219 add_uefi_link_args(lj);
12201220 break;
12211221 case TargetSubsystemEfiRuntimeDriver:
1222 lj->args.append("/SUBSYSTEM:efi_runtime_driver");
1222 lj->args.append("-SUBSYSTEM:efi_runtime_driver");
12231223 add_uefi_link_args(lj);
12241224 break;
12251225 case TargetSubsystemNative:
1226 lj->args.append("/SUBSYSTEM:native");
1226 lj->args.append("-SUBSYSTEM:native");
12271227 add_nt_link_args(lj, is_library);
12281228 break;
12291229 case TargetSubsystemPosix:
1230 lj->args.append("/SUBSYSTEM:posix");
1230 lj->args.append("-SUBSYSTEM:posix");
12311231 add_nt_link_args(lj, is_library);
12321232 break;
12331233 case TargetSubsystemWindows:
1234 lj->args.append("/SUBSYSTEM:windows");
1234 lj->args.append("-SUBSYSTEM:windows");
12351235 add_nt_link_args(lj, is_library);
12361236 break;
12371237 }