commit 60ac07940f06b4574c3ae044c8fea20777198fa4 Author: Nick Mathewson nickm@torproject.org Date: Thu May 19 16:38:24 2016 -0400
Fix "conditional "ADD_MULODI4" was never defined". --- configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac index f8cad48..1ee87a5 100644 --- a/configure.ac +++ b/configure.ac @@ -801,6 +801,7 @@ fi CFLAGS_BUGTRAP="$CFLAGS_FTRAPV $CFLAGS_ASAN $CFLAGS_UBSAN" CFLAGS_CONSTTIME="$CFLAGS_FWRAPV"
+mulodi_fixes_ftrapv=no if test "$have_clang" = "yes"; then saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CFLAGS_FTRAPV" @@ -817,7 +818,6 @@ if test "$have_clang" = "yes"; then } ]])], [ftrapv_can_link=yes; AC_MSG_RESULT([yes])], [ftrapv_can_link=no; AC_MSG_RESULT([no])]) - mulodi_fixes_ftrapv=no if test "$ftrapv_can_link" = "no"; then AC_MSG_CHECKING([whether defining __mulodi4 fixes that]) AC_LINK_IFELSE([ @@ -837,10 +837,11 @@ if test "$have_clang" = "yes"; then [mulodi_fixes_ftrapv=yes; AC_MSG_RESULT([yes])], [mulodi_fixes_ftrapv=no; AC_MSG_RESULT([no])]) fi - AM_CONDITIONAL(ADD_MULODI4, test "$mulodi_fixes_ftrapv" = "yes") CFLAGS="$saved_CFLAGS" fi
+AM_CONDITIONAL(ADD_MULODI4, test "$mulodi_fixes_ftrapv" = "yes") + dnl These cflags add bunches of branches, and we haven't been able to dnl persuade ourselves that they're suitable for code that needs to be dnl constant time.