crt: ucrt.mri: Use one shared mri file for all architectures
This requires adding libucrt.a to a DATA target in automake, instead
of LIBRARIES.
Signed-off-by: Martin Storsjö <martin@martin.st>
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index e0681cb..224a6bc 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -862,7 +862,7 @@
lib32_libucrtbase_a_CPPFLAGS=$(CPPFLAGS32) -D__LIBMSVCRT__ $(extra_include) $(sysincludes)
EXTRA_lib32_libucrtbase_a_DEPENDENCIES=lib32/ucrtbase.def
-lib32_LIBRARIES += lib32/libucrt.a
+lib32_DATA += lib32/libucrt.a
noinst_LIBRARIES += lib32/libucrt_extra.a
lib32_libucrt_extra_a_SOURCES = $(src_ucrtbase)
lib32_libucrt_extra_a_CPPFLAGS=$(CPPFLAGS32) -D__LIBMSVCRT__ $(extra_include) $(sysincludes)
@@ -876,16 +876,6 @@
lib32/lib%.a: lib-common/%.def
$(DTDEF32) $<
-lib32/libucrt.a: lib32/ucrt.mri lib32/libucrt_extra.a \
- lib32/libapi-ms-win-crt-conio-l1-1-0.a lib32/libapi-ms-win-crt-convert-l1-1-0.a lib32/libapi-ms-win-crt-environment-l1-1-0.a \
- lib32/libapi-ms-win-crt-filesystem-l1-1-0.a lib32/libapi-ms-win-crt-heap-l1-1-0.a lib32/libapi-ms-win-crt-locale-l1-1-0.a \
- lib32/libapi-ms-win-crt-math-l1-1-0.a lib32/libapi-ms-win-crt-multibyte-l1-1-0.a lib32/libapi-ms-win-crt-private-l1-1-0.a \
- lib32/libapi-ms-win-crt-process-l1-1-0.a lib32/libapi-ms-win-crt-runtime-l1-1-0.a lib32/libapi-ms-win-crt-stdio-l1-1-0.a \
- lib32/libapi-ms-win-crt-string-l1-1-0.a lib32/libapi-ms-win-crt-time-l1-1-0.a lib32/libapi-ms-win-crt-utility-l1-1-0.a
- rm -f $@
- $(AR) -M < $<
- $(RANLIB) $@
-
dx32_DATA =
dx32_DATA += lib32/libxinput.a
dx32_DATA += lib32/libxapofx.a
@@ -1199,7 +1189,7 @@
lib64_libucrtbase_a_CPPFLAGS=$(CPPFLAGS64) -D__LIBMSVCRT__ $(extra_include) $(sysincludes)
EXTRA_lib64_libucrtbase_a_DEPENDENCIES=lib64/ucrtbase.def
-lib64_LIBRARIES += lib64/libucrt.a
+lib64_DATA += lib64/libucrt.a
noinst_LIBRARIES += lib64/libucrt_extra.a
lib64_libucrt_extra_a_SOURCES = $(src_ucrtbase)
lib64_libucrt_extra_a_CPPFLAGS=$(CPPFLAGS64) -D__LIBMSVCRT__ $(extra_include) $(sysincludes)
@@ -1213,16 +1203,6 @@
lib64/lib%.a: lib-common/%.def
$(DTDEF64) $<
-lib64/libucrt.a: lib64/ucrt.mri lib64/libucrt_extra.a \
- lib64/libapi-ms-win-crt-conio-l1-1-0.a lib64/libapi-ms-win-crt-convert-l1-1-0.a lib64/libapi-ms-win-crt-environment-l1-1-0.a \
- lib64/libapi-ms-win-crt-filesystem-l1-1-0.a lib64/libapi-ms-win-crt-heap-l1-1-0.a lib64/libapi-ms-win-crt-locale-l1-1-0.a \
- lib64/libapi-ms-win-crt-math-l1-1-0.a lib64/libapi-ms-win-crt-multibyte-l1-1-0.a lib64/libapi-ms-win-crt-private-l1-1-0.a \
- lib64/libapi-ms-win-crt-process-l1-1-0.a lib64/libapi-ms-win-crt-runtime-l1-1-0.a lib64/libapi-ms-win-crt-stdio-l1-1-0.a \
- lib64/libapi-ms-win-crt-string-l1-1-0.a lib64/libapi-ms-win-crt-time-l1-1-0.a lib64/libapi-ms-win-crt-utility-l1-1-0.a
- rm -f $@
- $(AR) -M < $<
- $(RANLIB) $@
-
dx64_DATA =
dx64_DATA += lib64/libxinput.a
dx64_DATA += lib64/libxapofx.a
@@ -1496,7 +1476,7 @@
libarm32_libucrtbase_a_CPPFLAGS=$(CPPFLAGSARM32) -D__LIBMSVCRT__ $(extra_include) $(sysincludes)
EXTRA_libarm32_libucrtbase_a_DEPENDENCIES=libarm32/ucrtbase.def
-libarm32_LIBRARIES += libarm32/libucrt.a
+libarm32_DATA += libarm32/libucrt.a
noinst_LIBRARIES += libarm32/libucrt_extra.a
libarm32_libucrt_extra_a_SOURCES = $(src_ucrtbase)
libarm32_libucrt_extra_a_CPPFLAGS=$(CPPFLAGSARM32) -D__LIBMSVCRT__ $(extra_include) $(sysincludes)
@@ -1511,16 +1491,6 @@
$(DTDEFARM32) $<
-libarm32/libucrt.a: libarm32/ucrt.mri libarm32/libucrt_extra.a \
- libarm32/libapi-ms-win-crt-conio-l1-1-0.a libarm32/libapi-ms-win-crt-convert-l1-1-0.a libarm32/libapi-ms-win-crt-environment-l1-1-0.a \
- libarm32/libapi-ms-win-crt-filesystem-l1-1-0.a libarm32/libapi-ms-win-crt-heap-l1-1-0.a libarm32/libapi-ms-win-crt-locale-l1-1-0.a \
- libarm32/libapi-ms-win-crt-math-l1-1-0.a libarm32/libapi-ms-win-crt-multibyte-l1-1-0.a libarm32/libapi-ms-win-crt-private-l1-1-0.a \
- libarm32/libapi-ms-win-crt-process-l1-1-0.a libarm32/libapi-ms-win-crt-runtime-l1-1-0.a libarm32/libapi-ms-win-crt-stdio-l1-1-0.a \
- libarm32/libapi-ms-win-crt-string-l1-1-0.a libarm32/libapi-ms-win-crt-time-l1-1-0.a libarm32/libapi-ms-win-crt-utility-l1-1-0.a
- rm -f $@
- $(AR) -M < $<
- $(RANLIB) $@
-
dx32_DATA =
dx32_DATA += libarm32/libxinput.a
dx32_DATA += libarm32/libd3dcompiler.a
@@ -1761,7 +1731,7 @@
libarm64_libucrtbase_a_CPPFLAGS=$(CPPFLAGSARM64) -D__LIBMSVCRT__ $(extra_include) $(sysincludes)
EXTRA_libarm64_libucrtbase_a_DEPENDENCIES=libarm64/ucrtbase.def
-libarm64_LIBRARIES += libarm64/libucrt.a
+libarm64_DATA += libarm64/libucrt.a
noinst_LIBRARIES += libarm64/libucrt_extra.a
libarm64_libucrt_extra_a_SOURCES = $(src_ucrtbase)
libarm64_libucrt_extra_a_CPPFLAGS=$(CPPFLAGSARM64) -D__LIBMSVCRT__ $(extra_include) $(sysincludes)
@@ -1775,16 +1745,6 @@
libarm64/lib%.a: lib-common/%.def
$(DTDEFARM64) $<
-libarm64/libucrt.a: libarm64/ucrt.mri libarm64/libucrt_extra.a \
- libarm64/libapi-ms-win-crt-conio-l1-1-0.a libarm64/libapi-ms-win-crt-convert-l1-1-0.a libarm64/libapi-ms-win-crt-environment-l1-1-0.a \
- libarm64/libapi-ms-win-crt-filesystem-l1-1-0.a libarm64/libapi-ms-win-crt-heap-l1-1-0.a libarm64/libapi-ms-win-crt-locale-l1-1-0.a \
- libarm64/libapi-ms-win-crt-math-l1-1-0.a libarm64/libapi-ms-win-crt-multibyte-l1-1-0.a libarm64/libapi-ms-win-crt-private-l1-1-0.a \
- libarm64/libapi-ms-win-crt-process-l1-1-0.a libarm64/libapi-ms-win-crt-runtime-l1-1-0.a libarm64/libapi-ms-win-crt-stdio-l1-1-0.a \
- libarm64/libapi-ms-win-crt-string-l1-1-0.a libarm64/libapi-ms-win-crt-time-l1-1-0.a libarm64/libapi-ms-win-crt-utility-l1-1-0.a
- rm -f $@
- $(AR) -M < $<
- $(RANLIB) $@
-
dx64_DATA =
dx64_DATA += libarm64/libxinput.a
dx64_DATA += libarm64/libd3dcompiler.a
@@ -2102,6 +2062,16 @@
cd $(dir $@) && $(AR) -M < $(abspath $<)
$(RANLIB) $@
+%/libucrt.a: lib-common/ucrt.mri %/libucrt_extra.a \
+ %/libapi-ms-win-crt-conio-l1-1-0.a %/libapi-ms-win-crt-convert-l1-1-0.a %/libapi-ms-win-crt-environment-l1-1-0.a \
+ %/libapi-ms-win-crt-filesystem-l1-1-0.a %/libapi-ms-win-crt-heap-l1-1-0.a %/libapi-ms-win-crt-locale-l1-1-0.a \
+ %/libapi-ms-win-crt-math-l1-1-0.a %/libapi-ms-win-crt-multibyte-l1-1-0.a %/libapi-ms-win-crt-private-l1-1-0.a \
+ %/libapi-ms-win-crt-process-l1-1-0.a %/libapi-ms-win-crt-runtime-l1-1-0.a %/libapi-ms-win-crt-stdio-l1-1-0.a \
+ %/libapi-ms-win-crt-string-l1-1-0.a %/libapi-ms-win-crt-time-l1-1-0.a %/libapi-ms-win-crt-utility-l1-1-0.a
+ rm -f $@
+ cd $(dir $@) && $(AR) -M < $(abspath $<)
+ $(RANLIB) $@
+
%.def: %.def.in
$(MKDIR_P) $(@D) && $(CPP) -x c $< -Wp,-w -undef -P -I$(top_srcdir)/def-include > $@
diff --git a/mingw-w64-crt/lib-common/ucrt.mri b/mingw-w64-crt/lib-common/ucrt.mri
new file mode 100644
index 0000000..5d49ce9
--- /dev/null
+++ b/mingw-w64-crt/lib-common/ucrt.mri
@@ -0,0 +1,19 @@
+CREATE libucrt.a
+ADDLIB libapi-ms-win-crt-conio-l1-1-0.a
+ADDLIB libapi-ms-win-crt-convert-l1-1-0.a
+ADDLIB libapi-ms-win-crt-environment-l1-1-0.a
+ADDLIB libapi-ms-win-crt-filesystem-l1-1-0.a
+ADDLIB libapi-ms-win-crt-heap-l1-1-0.a
+ADDLIB libapi-ms-win-crt-locale-l1-1-0.a
+ADDLIB libapi-ms-win-crt-math-l1-1-0.a
+ADDLIB libapi-ms-win-crt-multibyte-l1-1-0.a
+ADDLIB libapi-ms-win-crt-private-l1-1-0.a
+ADDLIB libapi-ms-win-crt-process-l1-1-0.a
+ADDLIB libapi-ms-win-crt-runtime-l1-1-0.a
+ADDLIB libapi-ms-win-crt-stdio-l1-1-0.a
+ADDLIB libapi-ms-win-crt-string-l1-1-0.a
+ADDLIB libapi-ms-win-crt-time-l1-1-0.a
+ADDLIB libapi-ms-win-crt-utility-l1-1-0.a
+ADDLIB libucrt_extra.a
+SAVE
+END
diff --git a/mingw-w64-crt/lib32/ucrt.mri b/mingw-w64-crt/lib32/ucrt.mri
deleted file mode 100644
index 01621e2..0000000
--- a/mingw-w64-crt/lib32/ucrt.mri
+++ /dev/null
@@ -1,19 +0,0 @@
-CREATE lib32/libucrt.a
-ADDLIB lib32/libapi-ms-win-crt-conio-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-crt-convert-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-crt-environment-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-crt-filesystem-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-crt-heap-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-crt-locale-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-crt-math-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-crt-multibyte-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-crt-private-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-crt-process-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-crt-runtime-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-crt-stdio-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-crt-string-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-crt-time-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-crt-utility-l1-1-0.a
-ADDLIB lib32/libucrt_extra.a
-SAVE
-END
diff --git a/mingw-w64-crt/lib64/ucrt.mri b/mingw-w64-crt/lib64/ucrt.mri
deleted file mode 100644
index ef5b56c..0000000
--- a/mingw-w64-crt/lib64/ucrt.mri
+++ /dev/null
@@ -1,19 +0,0 @@
-CREATE lib64/libucrt.a
-ADDLIB lib64/libapi-ms-win-crt-conio-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-crt-convert-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-crt-environment-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-crt-filesystem-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-crt-heap-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-crt-locale-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-crt-math-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-crt-multibyte-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-crt-private-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-crt-process-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-crt-runtime-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-crt-stdio-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-crt-string-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-crt-time-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-crt-utility-l1-1-0.a
-ADDLIB lib64/libucrt_extra.a
-SAVE
-END
diff --git a/mingw-w64-crt/libarm32/ucrt.mri b/mingw-w64-crt/libarm32/ucrt.mri
deleted file mode 100644
index bbd4c0c..0000000
--- a/mingw-w64-crt/libarm32/ucrt.mri
+++ /dev/null
@@ -1,19 +0,0 @@
-CREATE libarm32/libucrt.a
-ADDLIB libarm32/libapi-ms-win-crt-conio-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-crt-convert-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-crt-environment-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-crt-filesystem-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-crt-heap-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-crt-locale-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-crt-math-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-crt-multibyte-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-crt-private-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-crt-process-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-crt-runtime-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-crt-stdio-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-crt-string-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-crt-time-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-crt-utility-l1-1-0.a
-ADDLIB libarm32/libucrt_extra.a
-SAVE
-END
diff --git a/mingw-w64-crt/libarm64/ucrt.mri b/mingw-w64-crt/libarm64/ucrt.mri
deleted file mode 100644
index 8161a87..0000000
--- a/mingw-w64-crt/libarm64/ucrt.mri
+++ /dev/null
@@ -1,19 +0,0 @@
-CREATE libarm64/libucrt.a
-ADDLIB libarm64/libapi-ms-win-crt-conio-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-crt-convert-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-crt-environment-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-crt-filesystem-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-crt-heap-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-crt-locale-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-crt-math-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-crt-multibyte-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-crt-private-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-crt-process-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-crt-runtime-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-crt-stdio-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-crt-string-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-crt-time-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-crt-utility-l1-1-0.a
-ADDLIB libarm64/libucrt_extra.a
-SAVE
-END
