aboutsummaryrefslogtreecommitdiff
path: root/lib/builtins
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2016-01-13 20:02:03 +0000
committerDimitry Andric <dim@FreeBSD.org>2016-01-13 20:02:03 +0000
commitfc411a9eb44c912f867b49a08d4ea98be89681d9 (patch)
tree83d2530c824b866f040519d74b68316c571e0986 /lib/builtins
parent4e3a0d5a8f750527f2f433019967f8f8214c558a (diff)
downloadsrc-fc411a9eb44c912f867b49a08d4ea98be89681d9.tar.gz
src-fc411a9eb44c912f867b49a08d4ea98be89681d9.zip
Vendor import of compiler-rt trunk r257626:vendor/compiler-rt/compiler-rt-trunk-r257626
Notes
Notes: svn path=/vendor/compiler-rt/dist/; revision=293842 svn path=/vendor/compiler-rt/compiler-rt-trunk-r257626/; revision=293843; tag=vendor/compiler-rt/compiler-rt-trunk-r257626
Diffstat (limited to 'lib/builtins')
-rw-r--r--lib/builtins/CMakeLists.txt3
-rw-r--r--lib/builtins/int_types.h3
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt
index 5ffad1d47b17..7ac4eea02624 100644
--- a/lib/builtins/CMakeLists.txt
+++ b/lib/builtins/CMakeLists.txt
@@ -353,6 +353,9 @@ set(mipsel_SOURCES ${mips_SOURCES})
set(mips64_SOURCES ${mips_SOURCES})
set(mips64el_SOURCES ${mips_SOURCES})
+set(wasm32_SOURCES ${GENERIC_SOURCES})
+set(wasm64_SOURCES ${GENERIC_SOURCES})
+
add_custom_target(builtins)
if (APPLE)
diff --git a/lib/builtins/int_types.h b/lib/builtins/int_types.h
index 2dad43bc7389..660385ecd6ae 100644
--- a/lib/builtins/int_types.h
+++ b/lib/builtins/int_types.h
@@ -61,7 +61,8 @@ typedef union
} udwords;
/* MIPS64 issue: PR 20098 */
-#if defined(__LP64__) && !(defined(__mips__) && defined(__clang__))
+#if (defined(__LP64__) || defined(__wasm__)) && \
+ !(defined(__mips__) && defined(__clang__))
#define CRT_HAS_128BIT
#endif