aboutsummaryrefslogtreecommitdiff
path: root/src/common/include.am
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-05-18 09:44:05 -0400
committerNick Mathewson <nickm@torproject.org>2016-05-18 09:50:38 -0400
commit6d6c8287d5e060117bfa066f87d4e2fc08ab708d (patch)
treec4a5cd552acc2037b7cfa1e656efd79357cfc0a1 /src/common/include.am
parent33034600c250068cb1c413ddf9dba894f8ca6182 (diff)
downloadtor-6d6c8287d5e060117bfa066f87d4e2fc08ab708d.tar.gz
tor-6d6c8287d5e060117bfa066f87d4e2fc08ab708d.zip
Include __mulodi4 in libor_ctime when it fixes clang -m32 -ftrapv
We use a pretty specific pair of autoconf tests here to make sure that we only add this code when: a) a 64-bit signed multiply fails to link, AND b) the same 64-bit signed multiply DOES link correctly when __mulodi4 is defined. Closes ticket 19079.
Diffstat (limited to 'src/common/include.am')
-rw-r--r--src/common/include.am7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/common/include.am b/src/common/include.am
index c39ad8d16b..222afe0291 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -62,7 +62,14 @@ else
readpassphrase_source=
endif
+if ADD_MULODI4
+mulodi4_source=src/ext/mulodi/mulodi4.c
+else
+mulodi4_source=
+endif
+
LIBOR_CTIME_A_SRC = \
+ $(mulodi4_source) \
src/ext/csiphash.c \
src/common/di_ops.c