---
mingw-w64-crt/Makefile.am | 14 +++++++++++---
mingw-w64-crt/crt/CRT_fp10.c | 8 --------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 1e5a0d14b..15642b3ff 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -112,7 +112,7 @@ src_libdloadhelper=libsrc/dloadhelper.c misc/delay-f.c
src_libmingw32=include/oscalls.h include/internal.h include/sect_attribs.h \
crt/crtexewin.c crt/dll_argv.c crt/gccmain.c crt/natstart.c
crt/pseudo-reloc-list.c crt/wildcard.c \
crt/charmax.c crt/ucrtexewin.c crt/dllargv.c crt/_newmode.c
crt/tlssup.c crt/xncommod.c \
- crt/cinitexe.c crt/merr.c crt/pesect.c crt/udllargc.c
crt/xthdloc.c crt/CRT_fp10.c \
+ crt/cinitexe.c crt/merr.c crt/pesect.c crt/udllargc.c
crt/xthdloc.c \
crt/mingw_custom.c crt/mingw_helpers.c \
crt/pseudo-reloc.c crt/udll_argv.c \
crt/usermatherr.c \
@@ -1143,6 +1143,8 @@ else
crt32_DATA =
endif
+src_libmingw32 += crt/CRT_fp10.c
+
COMPILE32=$(COMPILE) $(CPPFLAGS32) $(extra_include) -D_SYSCRT=1
lib32/crt1.o: crt/crtexe.c
$(COMPILE32) -c $< -o $@
@@ -1578,6 +1580,8 @@ else
crt64_DATA =
endif
+src_libmingw32 += crt/CRT_fp10.c
+
COMPILE64=$(COMPILE) $(CPPFLAGS64) $(extra_include) -D_SYSCRT=1
lib64/crt1.o: crt/crtexe.c
$(COMPILE64) -c $< -o $@
@@ -1941,12 +1945,14 @@ dx32dir=$(libarm32dir)
if !W32API
crt32_DATA = \
libarm32/crt1.o libarm32/crt2.o libarm32/crt1u.o libarm32/crt2u.o
libarm32/dllcrt1.o libarm32/dllcrt2.o \
- libarm32/CRT_fp8.o libarm32/CRT_fp10.o libarm32/txtmode.o libarm32/binmode.o
libarm32/crtbegin.o libarm32/crtend.o \
+ libarm32/CRT_fp8.o libarm32/txtmode.o libarm32/binmode.o
libarm32/crtbegin.o libarm32/crtend.o \
libarm32/gcrt0.o libarm32/gcrt1.o libarm32/gcrt2.o
libarm32/CRT_glob.o libarm32/CRT_noglob.o
else
crt32_DATA =
endif
+src_libmingw32 += crt/CRT_fp8.c
+
COMPILE32=$(COMPILE) $(CPPFLAGSARM32) $(extra_include) -D_SYSCRT=1
libarm32/crt1.o: crt/crtexe.c
$(COMPILE32) -c $< -o $@
@@ -2263,12 +2269,14 @@ dx64dir=$(libarm64dir)
if !W32API
crt64_DATA = \
libarm64/crt1.o libarm64/crt2.o libarm64/crt1u.o libarm64/crt2u.o
libarm64/dllcrt1.o libarm64/dllcrt2.o \
- libarm64/CRT_fp8.o libarm64/CRT_fp10.o libarm64/txtmode.o libarm64/binmode.o
libarm64/crtbegin.o libarm64/crtend.o \
+ libarm64/CRT_fp8.o libarm64/txtmode.o libarm64/binmode.o
libarm64/crtbegin.o libarm64/crtend.o \
libarm64/gcrt0.o libarm64/gcrt1.o libarm64/gcrt2.o
libarm64/CRT_glob.o libarm64/CRT_noglob.o
else
crt64_DATA =
endif
+src_libmingw32 += crt/CRT_fp8.c
+
COMPILE64=$(COMPILE) $(CPPFLAGSARM64) $(extra_include) -D_SYSCRT=1
libarm64/crt1.o: crt/crtexe.c
$(COMPILE64) -c $< -o $@
diff --git a/mingw-w64-crt/crt/CRT_fp10.c b/mingw-w64-crt/crt/CRT_fp10.c
index f39b5175f..c8a8bfbee 100644
--- a/mingw-w64-crt/crt/CRT_fp10.c
+++ b/mingw-w64-crt/crt/CRT_fp10.c
@@ -8,19 +8,11 @@ void _fpreset (void);
void _fpreset (void)
{
-#if defined(_ARM_) || defined(__arm__)
- __asm__ __volatile__ (
- "vmsr fpscr, %0\n\t" : : "r"(0 /* INITIAL_FPSCR */));
-#elif defined(_ARM64_) || defined(__aarch64__)
- __asm__ __volatile__ (
- "msr fpcr, %0\n\t" : : "r"(0LL /* INITIAL_FPSCR */));
-#else
#ifdef __GNUC__
__asm__ ("fninit");
#else /* msvc: */
__asm fninit;
#endif
-#endif
}
#ifdef __GNUC__
--
2.48.1
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
