Skip to content

Commit f65a22c

Browse files
authored
Revert "Work around arm64 forwarder Linker bug (#62585)"
This reverts commit 9fd8cd6.
1 parent a813ad4 commit f65a22c

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
call %1 -host_arch=x64 -arch=arm64 -no_logo
22
call build.cmd %2 %3 %4
3-
exit /b 0

src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ cl /nologo /c /arm64EC /Fo%objDir%\aspnetcorev2_x64.obj empty.cpp
88
link /lib /nologo /machine:arm64 /def:aspnetcorev2_arm64.def /out:%objDir%\aspnetcorev2_arm64.lib
99
link /lib /nologo /machine:x64 /def:aspnetcorev2_x64.def /out:%objDir%\aspnetcorev2_x64.lib
1010

11-
link /dll /nologo /noentry /machine:arm64x /defArm64Native:aspnetcorev2_arm64.def /def:aspnetcorev2_x64.def %objDir%\aspnetcorev2_arm64.obj %objDir%\aspnetcorev2_x64.obj %objDir%\..\AspNetCoreModuleShim\x64\%configuration%\aspnetcoremodule.res /out:%binDir%\aspnetcorev2.dll %objDir%\aspnetcorev2_arm64.lib %objDir%\aspnetcorev2_x64.lib /FORCE:UNRESOLVED
11+
link /dll /nologo /noentry /machine:arm64x /defArm64Native:aspnetcorev2_arm64.def /def:aspnetcorev2_x64.def %objDir%\aspnetcorev2_arm64.obj %objDir%\aspnetcorev2_x64.obj %objDir%\..\AspNetCoreModuleShim\x64\%configuration%\aspnetcoremodule.res /out:%binDir%\aspnetcorev2.dll %objDir%\aspnetcorev2_arm64.lib %objDir%\aspnetcorev2_x64.lib
1212

1313
cl /nologo /nologo /c /Fo%objDir%\aspnetcorev2_outofprocess_arm64.obj empty.cpp
1414
cl /nologo /nologo /c /arm64EC /Fo%objDir%\aspnetcorev2_outofprocess_x64.obj empty.cpp
1515

1616
link /lib /nologo /machine:arm64 /def:aspnetcorev2_outofprocess_arm64.def /out:%objDir%\aspnetcorev2_outofprocess_arm64.lib
1717
link /lib /nologo /machine:x64 /def:aspnetcorev2_outofprocess_x64.def /out:%objDir%\aspnetcorev2_outofprocess_x64.lib
1818

19-
link /dll /nologo /noentry /machine:arm64x /defArm64Native:aspnetcorev2_outofprocess_arm64.def /def:aspnetcorev2_outofprocess_x64.def %objDir%\aspnetcorev2_outofprocess_arm64.obj %objDir%\aspnetcorev2_outofprocess_x64.obj %objDir%\..\OutOfProcessRequestHandler\x64\%configuration%\outofprocessrequesthandler.res /out:%binDir%\aspnetcorev2_outofprocess.dll %objDir%\aspnetcorev2_outofprocess_arm64.lib %objDir%\aspnetcorev2_outofprocess_x64.lib /FORCE:UNRESOLVED
19+
link /dll /nologo /noentry /machine:arm64x /defArm64Native:aspnetcorev2_outofprocess_arm64.def /def:aspnetcorev2_outofprocess_x64.def %objDir%\aspnetcorev2_outofprocess_arm64.obj %objDir%\aspnetcorev2_outofprocess_x64.obj %objDir%\..\OutOfProcessRequestHandler\x64\%configuration%\outofprocessrequesthandler.res /out:%binDir%\aspnetcorev2_outofprocess.dll %objDir%\aspnetcorev2_outofprocess_arm64.lib %objDir%\aspnetcorev2_outofprocess_x64.lib

src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
1717
<Target Name="Build" DependsOnTargets="SetBuildDefaultEnvironmentVariables">
1818
<MakeDir Directories="$(ObjDir);$(BinDir)" />
19-
<!-- Ignore link.exe ARM64X pure forwarder bug -->
20-
<!-- Revert once https://developercommunity.visualstudio.com/t/LINK-:-error-LNK2001:-unresolved-extern/10932429 is fixed -->
21-
<Exec Command="all.cmd $(Prompt) $(ObjDir) $(BinDir) $(Configuration)" ContinueOnError="true" IgnoreStandardErrorWarningFormat="true" />
19+
<Exec Command="all.cmd $(Prompt) $(ObjDir) $(BinDir) $(Configuration)" />
2220
</Target>
2321
</Project>

0 commit comments

Comments
 (0)