Remove the compiler-rt mingw/arm patch
This has now been committed upstream in the master branch (we check out the master branch of compiler-rt, not the 3.9 branch), in SVN rev 287465 (git mirror commit 8134888c4d01).
This commit is contained in:
Martin Storsjö authored and Martin Storsjo committed
1 parent
701bc94b8f
commit
1957272cd5
2 files changed
-309
No files matched your search
@@ -104,10 +104,7 @@ RUN cd mingw-w64/mingw-w64-crt && \
|
|||||||
|
|
||||||
RUN cp /build/mingw-w64/mingw-w64-libraries/winpthreads/include/* $MINGW_PREFIX/include/
|
RUN cp /build/mingw-w64/mingw-w64-libraries/winpthreads/include/* $MINGW_PREFIX/include/
|
||||||
|
|
||||||
COPY patches/compiler-rt-*.patch /build/patches/
|
|
||||||
RUN git clone -b master --depth=1 https://github.com/llvm-mirror/compiler-rt.git
|
RUN git clone -b master --depth=1 https://github.com/llvm-mirror/compiler-rt.git
|
||||||
RUN cd compiler-rt && \
|
|
||||||
git am /build/patches/compiler-rt-*.patch
|
|
||||||
|
|
||||||
# Manually build compiler-rt as a standalone project
|
# Manually build compiler-rt as a standalone project
|
||||||
RUN cd compiler-rt && mkdir build && cd build && cmake \
|
RUN cd compiler-rt && mkdir build && cd build && cmake \
|
||||||
|
|||||||
@@ -1,306 +0,0 @@
|
|||||||
From 43abf42d132d75e8f51519b8c946e7a57e94175b Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
|
|
||||||
Date: Fri, 7 Oct 2016 16:44:22 +0300
|
|
||||||
Subject: [PATCH] builtins: Allow building windows arm functions for mingw
|
|
||||||
|
|
||||||
When building for MSVC, the msvcrt libraries contain these functions.
|
|
||||||
When building in a mingw environment, we need to provide them somehow,
|
|
||||||
e.g. via compiler-rt.
|
|
||||||
|
|
||||||
The divmod functions work in the same way as the corresponding
|
|
||||||
__rt_*div* functions for windows, but their parameters are swapped.
|
|
||||||
---
|
|
||||||
lib/builtins/CMakeLists.txt | 25 ++++++++++++++++++++++++-
|
|
||||||
lib/builtins/arm/aeabi_idivmod.S | 9 +++++++++
|
|
||||||
lib/builtins/arm/aeabi_ldivmod.S | 12 ++++++++++++
|
|
||||||
lib/builtins/arm/aeabi_uidivmod.S | 9 +++++++++
|
|
||||||
lib/builtins/arm/aeabi_uldivmod.S | 12 ++++++++++++
|
|
||||||
lib/builtins/fixdfdi.c | 8 ++++++++
|
|
||||||
lib/builtins/fixsfdi.c | 8 ++++++++
|
|
||||||
lib/builtins/fixunsdfdi.c | 8 ++++++++
|
|
||||||
lib/builtins/fixunssfdi.c | 8 ++++++++
|
|
||||||
lib/builtins/floatdidf.c | 8 ++++++++
|
|
||||||
lib/builtins/floatdisf.c | 8 ++++++++
|
|
||||||
lib/builtins/floatundidf.c | 8 ++++++++
|
|
||||||
lib/builtins/floatundisf.c | 8 ++++++++
|
|
||||||
13 files changed, 130 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt
|
|
||||||
index 5cbc1cb..1fc4b32 100644
|
|
||||||
--- a/lib/builtins/CMakeLists.txt
|
|
||||||
+++ b/lib/builtins/CMakeLists.txt
|
|
||||||
@@ -371,7 +371,30 @@ set(arm_Thumb1_SOURCES
|
|
||||||
${arm_Thumb1_VFPv2_SOURCES}
|
|
||||||
${arm_Thumb1_icache_SOURCES})
|
|
||||||
|
|
||||||
-if(NOT WIN32)
|
|
||||||
+if(MINGW)
|
|
||||||
+ set(arm_SOURCES
|
|
||||||
+ fixdfdi.c
|
|
||||||
+ fixsfdi.c
|
|
||||||
+ fixunsdfdi.c
|
|
||||||
+ fixunssfdi.c
|
|
||||||
+ floatdidf.c
|
|
||||||
+ floatdisf.c
|
|
||||||
+ floatundidf.c
|
|
||||||
+ floatundisf.c
|
|
||||||
+ arm/aeabi_idivmod.S
|
|
||||||
+ arm/aeabi_ldivmod.S
|
|
||||||
+ arm/aeabi_uidivmod.S
|
|
||||||
+ arm/aeabi_uldivmod.S
|
|
||||||
+ divmoddi4.c
|
|
||||||
+ divmodsi4.c
|
|
||||||
+ divdi3.c
|
|
||||||
+ divsi3.c
|
|
||||||
+ moddi3.c
|
|
||||||
+ udivmoddi4.c
|
|
||||||
+ udivmodsi4.c
|
|
||||||
+ udivsi3.c
|
|
||||||
+ umoddi3.c)
|
|
||||||
+else(MINGW)
|
|
||||||
# TODO the EABI sources should only be added to EABI targets
|
|
||||||
set(arm_SOURCES
|
|
||||||
${arm_SOURCES}
|
|
||||||
diff --git a/lib/builtins/arm/aeabi_idivmod.S b/lib/builtins/arm/aeabi_idivmod.S
|
|
||||||
index 2fcad86..5dab937 100644
|
|
||||||
--- a/lib/builtins/arm/aeabi_idivmod.S
|
|
||||||
+++ b/lib/builtins/arm/aeabi_idivmod.S
|
|
||||||
@@ -15,12 +15,21 @@
|
|
||||||
// return {quot, rem};
|
|
||||||
// }
|
|
||||||
|
|
||||||
+#ifdef __MINGW32__
|
|
||||||
+#define __aeabi_idivmod __rt_sdiv
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
.syntax unified
|
|
||||||
.p2align 2
|
|
||||||
DEFINE_COMPILERRT_FUNCTION(__aeabi_idivmod)
|
|
||||||
push { lr }
|
|
||||||
sub sp, sp, #4
|
|
||||||
mov r2, sp
|
|
||||||
+#ifdef __MINGW32__
|
|
||||||
+ mov r3, r0
|
|
||||||
+ mov r0, r1
|
|
||||||
+ mov r1, r3
|
|
||||||
+#endif
|
|
||||||
bl SYMBOL_NAME(__divmodsi4)
|
|
||||||
ldr r1, [sp]
|
|
||||||
add sp, sp, #4
|
|
||||||
diff --git a/lib/builtins/arm/aeabi_ldivmod.S b/lib/builtins/arm/aeabi_ldivmod.S
|
|
||||||
index 9f161f3..4821e82 100644
|
|
||||||
--- a/lib/builtins/arm/aeabi_ldivmod.S
|
|
||||||
+++ b/lib/builtins/arm/aeabi_ldivmod.S
|
|
||||||
@@ -16,6 +16,10 @@
|
|
||||||
// return {quot, rem};
|
|
||||||
// }
|
|
||||||
|
|
||||||
+#ifdef __MINGW32__
|
|
||||||
+#define __aeabi_ldivmod __rt_sdiv64
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
.syntax unified
|
|
||||||
.p2align 2
|
|
||||||
DEFINE_COMPILERRT_FUNCTION(__aeabi_ldivmod)
|
|
||||||
@@ -23,6 +27,14 @@ DEFINE_COMPILERRT_FUNCTION(__aeabi_ldivmod)
|
|
||||||
sub sp, sp, #16
|
|
||||||
add r12, sp, #8
|
|
||||||
str r12, [sp]
|
|
||||||
+#ifdef __MINGW32__
|
|
||||||
+ mov r12, r0
|
|
||||||
+ mov r0, r2
|
|
||||||
+ mov r2, r12
|
|
||||||
+ mov r12, r1
|
|
||||||
+ mov r1, r3
|
|
||||||
+ mov r3, r12
|
|
||||||
+#endif
|
|
||||||
bl SYMBOL_NAME(__divmoddi4)
|
|
||||||
ldr r2, [sp, #8]
|
|
||||||
ldr r3, [sp, #12]
|
|
||||||
diff --git a/lib/builtins/arm/aeabi_uidivmod.S b/lib/builtins/arm/aeabi_uidivmod.S
|
|
||||||
index e1e12d9..6606a50 100644
|
|
||||||
--- a/lib/builtins/arm/aeabi_uidivmod.S
|
|
||||||
+++ b/lib/builtins/arm/aeabi_uidivmod.S
|
|
||||||
@@ -16,12 +16,21 @@
|
|
||||||
// return {quot, rem};
|
|
||||||
// }
|
|
||||||
|
|
||||||
+#ifdef __MINGW32__
|
|
||||||
+#define __aeabi_uidivmod __rt_udiv
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
.syntax unified
|
|
||||||
.p2align 2
|
|
||||||
DEFINE_COMPILERRT_FUNCTION(__aeabi_uidivmod)
|
|
||||||
push { lr }
|
|
||||||
sub sp, sp, #4
|
|
||||||
mov r2, sp
|
|
||||||
+#ifdef __MINGW32__
|
|
||||||
+ mov r3, r0
|
|
||||||
+ mov r0, r1
|
|
||||||
+ mov r1, r3
|
|
||||||
+#endif
|
|
||||||
bl SYMBOL_NAME(__udivmodsi4)
|
|
||||||
ldr r1, [sp]
|
|
||||||
add sp, sp, #4
|
|
||||||
diff --git a/lib/builtins/arm/aeabi_uldivmod.S b/lib/builtins/arm/aeabi_uldivmod.S
|
|
||||||
index e8aaef2..60fee45 100644
|
|
||||||
--- a/lib/builtins/arm/aeabi_uldivmod.S
|
|
||||||
+++ b/lib/builtins/arm/aeabi_uldivmod.S
|
|
||||||
@@ -16,6 +16,10 @@
|
|
||||||
// return {quot, rem};
|
|
||||||
// }
|
|
||||||
|
|
||||||
+#ifdef __MINGW32__
|
|
||||||
+#define __aeabi_uldivmod __rt_udiv64
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
.syntax unified
|
|
||||||
.p2align 2
|
|
||||||
DEFINE_COMPILERRT_FUNCTION(__aeabi_uldivmod)
|
|
||||||
@@ -23,6 +27,14 @@ DEFINE_COMPILERRT_FUNCTION(__aeabi_uldivmod)
|
|
||||||
sub sp, sp, #16
|
|
||||||
add r12, sp, #8
|
|
||||||
str r12, [sp]
|
|
||||||
+#ifdef __MINGW32__
|
|
||||||
+ mov r12, r0
|
|
||||||
+ mov r0, r2
|
|
||||||
+ mov r2, r12
|
|
||||||
+ mov r12, r1
|
|
||||||
+ mov r1, r3
|
|
||||||
+ mov r3, r12
|
|
||||||
+#endif
|
|
||||||
bl SYMBOL_NAME(__udivmoddi4)
|
|
||||||
ldr r2, [sp, #8]
|
|
||||||
ldr r3, [sp, #12]
|
|
||||||
diff --git a/lib/builtins/fixdfdi.c b/lib/builtins/fixdfdi.c
|
|
||||||
index 14283ef..4bcd432 100644
|
|
||||||
--- a/lib/builtins/fixdfdi.c
|
|
||||||
+++ b/lib/builtins/fixdfdi.c
|
|
||||||
@@ -44,3 +44,11 @@ __fixdfdi(fp_t a) {
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
+
|
|
||||||
+#ifdef __MINGW32__
|
|
||||||
+COMPILER_RT_ABI di_int
|
|
||||||
+__dtoi64(double a)
|
|
||||||
+{
|
|
||||||
+ return __fixdfdi(a);
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
diff --git a/lib/builtins/fixsfdi.c b/lib/builtins/fixsfdi.c
|
|
||||||
index fab47e2..24f6e83 100644
|
|
||||||
--- a/lib/builtins/fixsfdi.c
|
|
||||||
+++ b/lib/builtins/fixsfdi.c
|
|
||||||
@@ -45,3 +45,11 @@ __fixsfdi(fp_t a) {
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
+
|
|
||||||
+#ifdef __MINGW32__
|
|
||||||
+COMPILER_RT_ABI di_int
|
|
||||||
+__stoi64(float a)
|
|
||||||
+{
|
|
||||||
+ return __fixsfdi(a);
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
diff --git a/lib/builtins/fixunsdfdi.c b/lib/builtins/fixunsdfdi.c
|
|
||||||
index 4b0bc9e..5a8bb5c 100644
|
|
||||||
--- a/lib/builtins/fixunsdfdi.c
|
|
||||||
+++ b/lib/builtins/fixunsdfdi.c
|
|
||||||
@@ -42,3 +42,11 @@ __fixunsdfdi(fp_t a) {
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
+
|
|
||||||
+#ifdef __MINGW32__
|
|
||||||
+COMPILER_RT_ABI du_int
|
|
||||||
+__dtou64(double a)
|
|
||||||
+{
|
|
||||||
+ return __fixunsdfdi(a);
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
diff --git a/lib/builtins/fixunssfdi.c b/lib/builtins/fixunssfdi.c
|
|
||||||
index f8ebab8..72fdf4d 100644
|
|
||||||
--- a/lib/builtins/fixunssfdi.c
|
|
||||||
+++ b/lib/builtins/fixunssfdi.c
|
|
||||||
@@ -43,3 +43,11 @@ __fixunssfdi(fp_t a) {
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
+
|
|
||||||
+#ifdef __MINGW32__
|
|
||||||
+COMPILER_RT_ABI du_int
|
|
||||||
+__stou64(float a)
|
|
||||||
+{
|
|
||||||
+ return __fixunssfdi(a);
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
diff --git a/lib/builtins/floatdidf.c b/lib/builtins/floatdidf.c
|
|
||||||
index 2b023ad..d13f832 100644
|
|
||||||
--- a/lib/builtins/floatdidf.c
|
|
||||||
+++ b/lib/builtins/floatdidf.c
|
|
||||||
@@ -105,3 +105,11 @@ __floatdidf(di_int a)
|
|
||||||
return fb.f;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
+
|
|
||||||
+#ifdef __MINGW32__
|
|
||||||
+COMPILER_RT_ABI double
|
|
||||||
+__i64tod(di_int a)
|
|
||||||
+{
|
|
||||||
+ return __floatdidf(a);
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
diff --git a/lib/builtins/floatdisf.c b/lib/builtins/floatdisf.c
|
|
||||||
index 3e47580..8f9bf9d 100644
|
|
||||||
--- a/lib/builtins/floatdisf.c
|
|
||||||
+++ b/lib/builtins/floatdisf.c
|
|
||||||
@@ -78,3 +78,11 @@ __floatdisf(di_int a)
|
|
||||||
((su_int)a & 0x007FFFFF); /* mantissa */
|
|
||||||
return fb.f;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+#ifdef __MINGW32__
|
|
||||||
+COMPILER_RT_ABI float
|
|
||||||
+__i64tos(di_int a)
|
|
||||||
+{
|
|
||||||
+ return __floatdisf(a);
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
diff --git a/lib/builtins/floatundidf.c b/lib/builtins/floatundidf.c
|
|
||||||
index cfd3a7a..e7f63bf 100644
|
|
||||||
--- a/lib/builtins/floatundidf.c
|
|
||||||
+++ b/lib/builtins/floatundidf.c
|
|
||||||
@@ -104,3 +104,11 @@ __floatundidf(du_int a)
|
|
||||||
return fb.f;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
+
|
|
||||||
+#ifdef __MINGW32__
|
|
||||||
+COMPILER_RT_ABI double
|
|
||||||
+__u64tod(du_int a)
|
|
||||||
+{
|
|
||||||
+ return __floatundidf(a);
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
diff --git a/lib/builtins/floatundisf.c b/lib/builtins/floatundisf.c
|
|
||||||
index 713a44a..3716ec2 100644
|
|
||||||
--- a/lib/builtins/floatundisf.c
|
|
||||||
+++ b/lib/builtins/floatundisf.c
|
|
||||||
@@ -75,3 +75,11 @@ __floatundisf(du_int a)
|
|
||||||
((su_int)a & 0x007FFFFF); /* mantissa */
|
|
||||||
return fb.f;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+#ifdef __MINGW32__
|
|
||||||
+COMPILER_RT_ABI float
|
|
||||||
+__u64tos(du_int a)
|
|
||||||
+{
|
|
||||||
+ return __floatundisf(a);
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
--
|
|
||||||
2.7.4
|
|
||||||
|
|
||||||
Reference in new issue
Block a user