---
mingw-w64-crt/Makefile.am | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index b7fea893a..9066ac76f 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -25,6 +25,12 @@ AM_CXXFLAGS=@ADD_C_CXX_WARNING_FLAGS@
@ADD_CXX_ONLY_WARNING_FLAGS@
AM_CCASFLAGS=@CFGUARD_CFLAGS@
CPPFLAGSARM32=$(AM_CPPFLAGS) -mfpu=vfpv3
CPPFLAGSARM64=$(AM_CPPFLAGS)
+CPPFLAGSARM64NATIVE=$(AM_CPPFLAGS)
+CPPFLAGSARM64EC=$(AM_CPPFLAGS)
+if ARM64X
+ CPPFLAGSARM64 += -marm64x
+ CPPFLAGSARM64EC += -target arm64ec-windows-gnu
+endif
CPPFLAGS32=$(AM_CPPFLAGS) -m32 -masm=att
CPPFLAGS64=$(AM_CPPFLAGS) -m64 -masm=att
AM_DLLTOOLFLAGS=-k --as=$(AS) --output-lib $@
@@ -2588,7 +2594,7 @@ libarm64/%.o: crt/%.c
$(AM_V_CC)$(COMPILE) $(CPPFLAGSARM64) -c $< -o $@
libarm64/%.x86_64.o: %.S
- $(AM_V_CC)$(MKDIR_P) $(@D) && $(COMPILE) $(CPPFLAGSARM64) -target
x86_64-windows-gnu -c $< -o $@
+ $(AM_V_CC)$(MKDIR_P) $(@D) && $(COMPILE) $(AM_CPPFLAGS) -target
x86_64-windows-gnu -c $< -o $@
# These source files aren't compiled in to any library yet. I'm not sure how
/ where to do so.
# The source files that I did compile somewhere I just guessed at anyway.
@@ -4467,7 +4473,7 @@ libarm32/%.def: libarm32/%.def.in
$(AM_V_GEN)$(MKDIR_P) $(@D) && $(CPP) -x c $(CPPFLAGSARM32) $< -Wp,-w
-P -I$(top_srcdir)/def-include > $@
libarm64/%.def: libarm64/%.def.in
- $(AM_V_GEN)$(MKDIR_P) $(@D) && $(CPP) -x c $(CPPFLAGSARM64) $< -Wp,-w
-P -I$(top_srcdir)/def-include > $@
+ $(AM_V_GEN)$(MKDIR_P) $(@D) && $(CPP) -x c $(CPPFLAGSARM64NATIVE) $<
-Wp,-w -P -I$(top_srcdir)/def-include > $@
lib32/%.def: lib-common/%.def.in
$(AM_V_GEN)$(MKDIR_P) $(@D) && $(CPP) -x c $(CPPFLAGS32) $< -Wp,-w -P
-I$(top_srcdir)/def-include > $@
@@ -4479,7 +4485,7 @@ libarm32/%.def: lib-common/%.def.in
$(AM_V_GEN)$(MKDIR_P) $(@D) && $(CPP) -x c $(CPPFLAGSARM32) $< -Wp,-w
-P -I$(top_srcdir)/def-include | sed -E 's/^([^ ]+)@[0-9]+( |\r?$$)/\1\2/' > $@
libarm64/%.def: lib-common/%.def.in
- $(AM_V_GEN)$(MKDIR_P) $(@D) && $(CPP) -x c $(CPPFLAGSARM64) $< -Wp,-w
-P -I$(top_srcdir)/def-include | sed -E 's/^([^ ]+)@[0-9]+( |\r?$$)/\1\2/' > $@
+ $(AM_V_GEN)$(MKDIR_P) $(@D) && $(CPP) -x c $(CPPFLAGSARM64NATIVE) $<
-Wp,-w -P -I$(top_srcdir)/def-include | sed -E 's/^([^ ]+)@[0-9]+(
|\r$$)/\1\2/' > $@
# Don't compile these, but install as is:
#
--
2.53.0
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
