diff --git a/stl/aliases/arm64ec/std_init_once_begin_initialize.obj b/stl/aliases/arm64ec/std_init_once_begin_initialize.obj index 593e6c144ab..431291f2f90 100644 Binary files a/stl/aliases/arm64ec/std_init_once_begin_initialize.obj and b/stl/aliases/arm64ec/std_init_once_begin_initialize.obj differ diff --git a/stl/aliases/arm64ec/std_init_once_complete.obj b/stl/aliases/arm64ec/std_init_once_complete.obj index 35149685437..363bfe340e5 100644 Binary files a/stl/aliases/arm64ec/std_init_once_complete.obj and b/stl/aliases/arm64ec/std_init_once_complete.obj differ diff --git a/stl/aliases/generate.cmd b/stl/aliases/generate.cmd index afad08f9bd9..12cb87b3bc2 100644 --- a/stl/aliases/generate.cmd +++ b/stl/aliases/generate.cmd @@ -44,8 +44,7 @@ mkdir arm64ec chpe\std_init_once_begin_initialize.obj ..\..\..\..\..\tools\amd64\aliasobj.exe ^ /machine:arm64ec ^ - __imp___std_init_once_begin_initialize ^ - __imp_InitOnceBeginInitialize ^ + -m std_init_once_begin_initialize-arm64ec.txt ^ arm64ec\std_init_once_begin_initialize.obj :: __std_init_once_complete @@ -72,6 +71,5 @@ mkdir arm64ec chpe\std_init_once_complete.obj ..\..\..\..\..\tools\amd64\aliasobj.exe ^ /machine:arm64ec ^ - __imp___std_init_once_complete ^ - __imp_InitOnceComplete ^ + -m std_init_once_complete-arm64ec.txt ^ arm64ec\std_init_once_complete.obj diff --git a/stl/aliases/std_init_once_begin_initialize-arm64ec.txt b/stl/aliases/std_init_once_begin_initialize-arm64ec.txt new file mode 100644 index 00000000000..3431bdf51cf --- /dev/null +++ b/stl/aliases/std_init_once_begin_initialize-arm64ec.txt @@ -0,0 +1,2 @@ +#__std_init_once_begin_initialize #InitOnceBeginInitialize +__imp___std_init_once_begin_initialize __imp_InitOnceBeginInitialize diff --git a/stl/aliases/std_init_once_complete-arm64ec.txt b/stl/aliases/std_init_once_complete-arm64ec.txt new file mode 100644 index 00000000000..4a146c7abfc --- /dev/null +++ b/stl/aliases/std_init_once_complete-arm64ec.txt @@ -0,0 +1,2 @@ +#__std_init_once_complete #InitOnceComplete +__imp___std_init_once_complete __imp_InitOnceComplete diff --git a/stl/msbuild/stl_1/stl_1.files.settings.targets b/stl/msbuild/stl_1/stl_1.files.settings.targets index 7c36449ea49..8c423bd34ec 100644 --- a/stl/msbuild/stl_1/stl_1.files.settings.targets +++ b/stl/msbuild/stl_1/stl_1.files.settings.targets @@ -11,7 +11,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception "> nativecpp - diff --git a/stl/msbuild/stl_2/msvcp_2.settings.targets b/stl/msbuild/stl_2/msvcp_2.settings.targets index afcc4c12419..79540664211 100644 --- a/stl/msbuild/stl_2/msvcp_2.settings.targets +++ b/stl/msbuild/stl_2/msvcp_2.settings.targets @@ -36,8 +36,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception $(CrtBuildDir)\msvcprt_2$(BuildSuffix).$(MsvcpFlavor).import_only.lib $(LibOutputFileName).$(MsvcpFlavor) $(IntermediateOutputDirectory)\$(DllDefName).def - $(IntermediateOutputDirectoryEC)\$(DllDefName).def - $(IntermediateOutputDirectory)\$(DllDefName).def true $(OutputPath)\$(OutputName)$(_PDB_VER_NAME_)$(DllPdbFlavorSuffix) diff --git a/stl/msbuild/stl_2/stl_2.files.settings.targets b/stl/msbuild/stl_2/stl_2.files.settings.targets index 0b5a57a2c3d..4f28e08a72d 100644 --- a/stl/msbuild/stl_2/stl_2.files.settings.targets +++ b/stl/msbuild/stl_2/stl_2.files.settings.targets @@ -11,7 +11,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception "> nativecpp - diff --git a/stl/msbuild/stl_atomic_wait/stl_atomic_wait.files.settings.targets b/stl/msbuild/stl_atomic_wait/stl_atomic_wait.files.settings.targets index 05ac026443d..e7cc52c398d 100644 --- a/stl/msbuild/stl_atomic_wait/stl_atomic_wait.files.settings.targets +++ b/stl/msbuild/stl_atomic_wait/stl_atomic_wait.files.settings.targets @@ -17,21 +17,4 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception nativecpp - - - - - $(IntermediateOutputDirectoryEC)\atomic_wait.obj; - $(IntermediateOutputDirectoryEC)\parallel_algorithms.obj; - - - - - - - - - diff --git a/stl/msbuild/stl_base/libcp.settings.targets b/stl/msbuild/stl_base/libcp.settings.targets index 336c34ac84c..d9cbf1677a9 100644 --- a/stl/msbuild/stl_base/libcp.settings.targets +++ b/stl/msbuild/stl_base/libcp.settings.targets @@ -32,10 +32,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - - - - diff --git a/stl/msbuild/stl_base/msvcp.settings.targets b/stl/msbuild/stl_base/msvcp.settings.targets index 1155276faab..3dec66549c7 100644 --- a/stl/msbuild/stl_base/msvcp.settings.targets +++ b/stl/msbuild/stl_base/msvcp.settings.targets @@ -39,8 +39,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception $(CrtBuildDir)\msvcprt_base$(BuildSuffix).$(MsvcpFlavor).import_only.lib $(LibOutputFileName).$(MsvcpFlavor) $(IntermediateOutputDirectory)\$(DllDefName).def - $(IntermediateOutputDirectoryEC)\$(DllDefName).def - $(IntermediateOutputDirectory)\$(DllDefName).def $(ClDefines);_STL_CONCRT_SUPPORT true @@ -89,292 +87,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - - - - $(IntermediateOutputDirectoryEC)\_tolower.obj; - $(IntermediateOutputDirectoryEC)\_toupper.obj; - $(IntermediateOutputDirectoryEC)\atomic.obj; - $(IntermediateOutputDirectoryEC)\cthread.obj; - $(IntermediateOutputDirectoryEC)\xnotify.obj; - $(IntermediateOutputDirectoryEC)\xtime.obj; - $(IntermediateOutputDirectoryEC)\xcosh.obj; - $(IntermediateOutputDirectoryEC)\xdint.obj; - $(IntermediateOutputDirectoryEC)\xdnorm.obj; - $(IntermediateOutputDirectoryEC)\xdscale.obj; - $(IntermediateOutputDirectoryEC)\xdtento.obj; - $(IntermediateOutputDirectoryEC)\xdtest.obj; - $(IntermediateOutputDirectoryEC)\xdunscal.obj; - $(IntermediateOutputDirectoryEC)\xexp.obj; - $(IntermediateOutputDirectoryEC)\xfcosh.obj; - $(IntermediateOutputDirectoryEC)\xfdint.obj; - $(IntermediateOutputDirectoryEC)\xfdnorm.obj; - $(IntermediateOutputDirectoryEC)\xfdscale.obj; - $(IntermediateOutputDirectoryEC)\xfdtento.obj; - $(IntermediateOutputDirectoryEC)\xfdtest.obj; - $(IntermediateOutputDirectoryEC)\xfdunsca.obj; - $(IntermediateOutputDirectoryEC)\xferaise.obj; - $(IntermediateOutputDirectoryEC)\xfexp.obj; - $(IntermediateOutputDirectoryEC)\xfprec.obj; - $(IntermediateOutputDirectoryEC)\xfsinh.obj; - $(IntermediateOutputDirectoryEC)\xfvalues.obj; - $(IntermediateOutputDirectoryEC)\xgetwctype.obj; - $(IntermediateOutputDirectoryEC)\xlcosh.obj; - $(IntermediateOutputDirectoryEC)\xldint.obj; - $(IntermediateOutputDirectoryEC)\xldscale.obj; - $(IntermediateOutputDirectoryEC)\xldtento.obj; - $(IntermediateOutputDirectoryEC)\xldtest.obj; - $(IntermediateOutputDirectoryEC)\xldunsca.obj; - $(IntermediateOutputDirectoryEC)\xlexp.obj; - $(IntermediateOutputDirectoryEC)\xlpoly.obj; - $(IntermediateOutputDirectoryEC)\xlprec.obj; - $(IntermediateOutputDirectoryEC)\xlsinh.obj; - $(IntermediateOutputDirectoryEC)\xlvalues.obj; - $(IntermediateOutputDirectoryEC)\xmbtowc.obj; - $(IntermediateOutputDirectoryEC)\xmtx.obj; - $(IntermediateOutputDirectoryEC)\xpoly.obj; - $(IntermediateOutputDirectoryEC)\xprec.obj; - $(IntermediateOutputDirectoryEC)\xsinh.obj; - $(IntermediateOutputDirectoryEC)\xstod.obj; - $(IntermediateOutputDirectoryEC)\xstof.obj; - $(IntermediateOutputDirectoryEC)\xstoflt.obj; - $(IntermediateOutputDirectoryEC)\xstol.obj; - $(IntermediateOutputDirectoryEC)\xstold.obj; - $(IntermediateOutputDirectoryEC)\xstoll.obj; - $(IntermediateOutputDirectoryEC)\xstopfx.obj; - $(IntermediateOutputDirectoryEC)\xstoul.obj; - $(IntermediateOutputDirectoryEC)\xstoull.obj; - $(IntermediateOutputDirectoryEC)\xstoxflt.obj; - $(IntermediateOutputDirectoryEC)\xstrcoll.obj; - $(IntermediateOutputDirectoryEC)\xstrxfrm.obj; - $(IntermediateOutputDirectoryEC)\xtowlower.obj; - $(IntermediateOutputDirectoryEC)\xtowupper.obj; - $(IntermediateOutputDirectoryEC)\xvalues.obj; - $(IntermediateOutputDirectoryEC)\xwcscoll.obj; - $(IntermediateOutputDirectoryEC)\xwcsxfrm.obj; - $(IntermediateOutputDirectoryEC)\xwctomb.obj; - $(IntermediateOutputDirectoryEC)\xwstod.obj; - $(IntermediateOutputDirectoryEC)\xwstof.obj; - $(IntermediateOutputDirectoryEC)\xwstoflt.obj; - $(IntermediateOutputDirectoryEC)\xwstold.obj; - $(IntermediateOutputDirectoryEC)\xwstopfx.obj; - $(IntermediateOutputDirectoryEC)\xwstoxfl.obj; - $(IntermediateOutputDirectoryEC)\excptptr.obj; - $(IntermediateOutputDirectoryEC)\StlCompareStringA.obj; - $(IntermediateOutputDirectoryEC)\StlCompareStringW.obj; - $(IntermediateOutputDirectoryEC)\StlLCMapStringA.obj; - $(IntermediateOutputDirectoryEC)\StlLCMapStringW.obj; - $(IntermediateOutputDirectoryEC)\winapinls.obj; - $(IntermediateOutputDirectoryEC)\cerr.obj; - $(IntermediateOutputDirectoryEC)\cin.obj; - $(IntermediateOutputDirectoryEC)\clog.obj; - $(IntermediateOutputDirectoryEC)\cout.obj; - $(IntermediateOutputDirectoryEC)\filesys.obj; - $(IntermediateOutputDirectoryEC)\fiopen.obj; - $(IntermediateOutputDirectoryEC)\future.obj; - $(IntermediateOutputDirectoryEC)\iomanip.obj; - $(IntermediateOutputDirectoryEC)\ios.obj; - $(IntermediateOutputDirectoryEC)\iosptrs.obj; - $(IntermediateOutputDirectoryEC)\iostream.obj; - $(IntermediateOutputDirectoryEC)\locale.obj; - $(IntermediateOutputDirectoryEC)\locale0.obj; - $(IntermediateOutputDirectoryEC)\multprec.obj; - $(IntermediateOutputDirectoryEC)\raisehan.obj; - $(IntermediateOutputDirectoryEC)\stdhndlr.obj; - $(IntermediateOutputDirectoryEC)\stdthrow.obj; - $(IntermediateOutputDirectoryEC)\syserror.obj; - $(IntermediateOutputDirectoryEC)\cond.obj; - $(IntermediateOutputDirectoryEC)\mutex.obj; - $(IntermediateOutputDirectoryEC)\pplerror.obj; - $(IntermediateOutputDirectoryEC)\ppltasks.obj; - $(IntermediateOutputDirectoryEC)\taskscheduler.obj; - $(IntermediateOutputDirectoryEC)\thread0.obj; - $(IntermediateOutputDirectoryEC)\uncaught_exception.obj; - $(IntermediateOutputDirectoryEC)\uncaught_exceptions.obj; - $(IntermediateOutputDirectoryEC)\ushcerr.obj; - $(IntermediateOutputDirectoryEC)\ushcin.obj; - $(IntermediateOutputDirectoryEC)\ushclog.obj; - $(IntermediateOutputDirectoryEC)\ushcout.obj; - $(IntermediateOutputDirectoryEC)\ushiostr.obj; - $(IntermediateOutputDirectoryEC)\wcerr.obj; - $(IntermediateOutputDirectoryEC)\wcin.obj; - $(IntermediateOutputDirectoryEC)\wclog.obj; - $(IntermediateOutputDirectoryEC)\wcout.obj; - $(IntermediateOutputDirectoryEC)\wiostrea.obj; - $(IntermediateOutputDirectoryEC)\wlocale.obj; - $(IntermediateOutputDirectoryEC)\xalloc.obj; - $(IntermediateOutputDirectoryEC)\xdateord.obj; - $(IntermediateOutputDirectoryEC)\xlgamma.obj; - $(IntermediateOutputDirectoryEC)\xlocale.obj; - $(IntermediateOutputDirectoryEC)\xlock.obj; - $(IntermediateOutputDirectoryEC)\xonce.obj; - $(IntermediateOutputDirectoryEC)\xrngabort.obj; - $(IntermediateOutputDirectoryEC)\xrngdev.obj; - $(IntermediateOutputDirectoryEC)\xthrow.obj; - $(IntermediateOutputDirectoryEC)\winapisupp.obj; - $(IntermediateOutputDirectoryEC)\dllmain.obj; - $(IntermediateOutputDirectoryEC)\instances.obj; - - - - - $(IntermediateOutputDirectoryEC)\filesystem.obj; - $(IntermediateOutputDirectoryEC)\locale0_implib.obj; - $(IntermediateOutputDirectoryEC)\nothrow.obj; - $(IntermediateOutputDirectoryEC)\parallel_algorithms.obj; - $(IntermediateOutputDirectoryEC)\sharedmutex.obj; - $(IntermediateOutputDirectoryEC)\vector_algorithms.obj; - - - - - - - - - - false - true - - - - - - - - - - diff --git a/stl/msbuild/stl_codecvt_ids/msvcp_codecvt_ids.settings.targets b/stl/msbuild/stl_codecvt_ids/msvcp_codecvt_ids.settings.targets index 3df5ef40e29..2116ad9a688 100644 --- a/stl/msbuild/stl_codecvt_ids/msvcp_codecvt_ids.settings.targets +++ b/stl/msbuild/stl_codecvt_ids/msvcp_codecvt_ids.settings.targets @@ -50,11 +50,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception true - - $(IntermediateOutputDirectoryEC)\$(DllDefName).def - $(IntermediateOutputDirectory)\$(DllDefName).def - - LIBRARYNAME=$(OutputName.ToUpper());$(DllCppDefines) @@ -75,11 +70,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - - - - - - - - - - + + false + + + false + + + false + + + false + + + false +