Re: [Mingw-w64-public] [PATCH 2/5] crt: order libs alphabetically in windowsapp
On Mon, 26 Jun 2023, Steve Lhomme wrote: This is also the order reported by dumpbin and nm. Using sort -o windowsapp.mri windowsapp.mri and placing back the mri commands in their place. No functional changes. --- mingw-w64-crt/Makefile.am | 118 mingw-w64-crt/lib-common/windowsapp.mri | 114 +++ 2 files changed, 117 insertions(+), 115 deletions(-) The numbers don't add up here - there's 2 more insertions than deletions. I tried to recreate the end result by sorting the lines myself, and I concluded that your patch actually adds two new dependencies, libapi-ms-win-core-version-l1-1-1.a and libapi-ms-win-core-winrt-error-l1-1-0.a, which aren't listed in the .mri file. I removed those and will push the patch in that form. // Martin ___ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
[Mingw-w64-public] [PATCH 2/5] crt: order libs alphabetically in windowsapp
This is also the order reported by dumpbin and nm. Using sort -o windowsapp.mri windowsapp.mri and placing back the mri commands in their place. No functional changes. --- mingw-w64-crt/Makefile.am | 118 mingw-w64-crt/lib-common/windowsapp.mri | 114 +++ 2 files changed, 117 insertions(+), 115 deletions(-) diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am index e00ebb945..efe62903b 100644 --- a/mingw-w64-crt/Makefile.am +++ b/mingw-w64-crt/Makefile.am @@ -2186,150 +2186,151 @@ endif $(RANLIB) $@ %/libwindowsapp.a: lib-common/windowsapp.mri \ + %/libapi-ms-win-appmodel-runtime-l1-1-0.a \ + %/libapi-ms-win-appmodel-runtime-l1-1-1.a \ + %/libapi-ms-win-core-com-l1-1-0.a \ %/libapi-ms-win-core-com-l1-1-1.a \ %/libapi-ms-win-core-com-l2-1-1.a \ %/libapi-ms-win-core-com-midlproxystub-l1-1-0.a \ %/libapi-ms-win-core-comm-l1-1-0.a \ + %/libapi-ms-win-core-comm-l1-1-1.a \ + %/libapi-ms-win-core-comm-l1-1-2.a \ %/libapi-ms-win-core-console-l1-1-0.a \ + %/libapi-ms-win-core-console-l1-2-0.a \ + %/libapi-ms-win-core-console-l2-1-0.a \ + %/libapi-ms-win-core-console-l2-2-0.a \ + %/libapi-ms-win-core-console-l3-2-0.a \ %/libapi-ms-win-core-datetime-l1-1-0.a \ %/libapi-ms-win-core-datetime-l1-1-1.a \ %/libapi-ms-win-core-datetime-l1-1-2.a \ + %/libapi-ms-win-core-debug-l1-1-0.a \ %/libapi-ms-win-core-debug-l1-1-1.a \ %/libapi-ms-win-core-delayload-l1-1-1.a \ + %/libapi-ms-win-core-enclave-l1-1-0.a \ + %/libapi-ms-win-core-errorhandling-l1-1-0.a \ %/libapi-ms-win-core-errorhandling-l1-1-1.a \ %/libapi-ms-win-core-errorhandling-l1-1-3.a \ + %/libapi-ms-win-core-featurestaging-l1-1-0.a \ + %/libapi-ms-win-core-featurestaging-l1-1-1.a \ %/libapi-ms-win-core-fibers-l1-1-1.a \ %/libapi-ms-win-core-fibers-l2-1-1.a \ + %/libapi-ms-win-core-file-ansi-l1-1-0.a \ %/libapi-ms-win-core-file-ansi-l2-1-0.a \ + %/libapi-ms-win-core-file-fromapp-l1-1-0.a \ + %/libapi-ms-win-core-file-l1-1-0.a \ %/libapi-ms-win-core-file-l1-2-0.a \ %/libapi-ms-win-core-file-l1-2-1.a \ %/libapi-ms-win-core-file-l1-2-2.a \ %/libapi-ms-win-core-file-l2-1-0.a \ %/libapi-ms-win-core-file-l2-1-1.a \ + %/libapi-ms-win-core-file-l2-1-2.a \ + %/libapi-ms-win-core-firmware-l1-1-0.a \ %/libapi-ms-win-core-handle-l1-1-0.a \ %/libapi-ms-win-core-heap-l1-1-0.a \ %/libapi-ms-win-core-heap-l1-2-0.a \ + %/libapi-ms-win-core-heap-l2-1-0.a \ + %/libapi-ms-win-core-heap-obsolete-l1-1-0.a \ + %/libapi-ms-win-core-interlocked-l1-1-0.a \ %/libapi-ms-win-core-interlocked-l1-2-0.a \ %/libapi-ms-win-core-io-l1-1-0.a \ %/libapi-ms-win-core-io-l1-1-1.a \ + %/libapi-ms-win-core-kernel32-legacy-ansi-l1-1-0.a \ %/libapi-ms-win-core-kernel32-legacy-l1-1-0.a \ %/libapi-ms-win-core-kernel32-legacy-l1-1-1.a \ %/libapi-ms-win-core-largeinteger-l1-1-0.a \ %/libapi-ms-win-core-libraryloader-l1-2-0.a \ + %/libapi-ms-win-core-libraryloader-l1-2-1.a \ %/libapi-ms-win-core-libraryloader-l2-1-0.a \ %/libapi-ms-win-core-localization-ansi-l1-1-0.a \ + %/libapi-ms-win-core-localization-l1-2-0.a \ %/libapi-ms-win-core-localization-l1-2-1.a \ %/libapi-ms-win-core-localization-l1-2-2.a \ %/libapi-ms-win-core-localization-l2-1-0.a \ + %/libapi-ms-win-core-localization-obsolete-l1-2-0.a \ + %/libapi-ms-win-core-memory-l1-1-0.a \ + %/libapi-ms-win-core-memory-l1-1-1.a \ %/libapi-ms-win-core-memory-l1-1-2.a \ %/libapi-ms-win-core-memory-l1-1-3.a \ + %/libapi-ms-win-core-memory-l1-1-5.a \ + %/libapi-ms-win-core-memory-l1-1-6.a \ + %/libapi-ms-win-core-memory-l1-1-7.a \ %/libapi-ms-win-core-namedpipe-ansi-l1-1-0.a \ %/libapi-ms-win-core-namedpipe-ansi-l1-1-1.a \ %/libapi-ms-win-core-namedpipe-l1-1-0.a \ %/libapi-ms-win-core-namedpipe-l1-2-1.a \ %/libapi-ms-win-core-namedpipe-l1-2-2.a \ + %/libapi-ms-win-core-namespace-ansi-l1-1-0.a \ + %/libapi-ms-win-core-namespace-l1-1-0.a \
