sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix "conditional "ADD_MULODI4" was never defined".

This commit is contained in:
Nick Mathewson 2016-05-19 16:38:24 -04:00
parent dcc4fd4403
commit 60ac07940f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -801,6 +801,7 @@ fi
CFLAGS_BUGTRAP="$CFLAGS_FTRAPV $CFLAGS_ASAN $CFLAGS_UBSAN" CFLAGS_BUGTRAP="$CFLAGS_FTRAPV $CFLAGS_ASAN $CFLAGS_UBSAN"
CFLAGS_CONSTTIME="$CFLAGS_FWRAPV" CFLAGS_CONSTTIME="$CFLAGS_FWRAPV"
mulodi_fixes_ftrapv=no
if test "$have_clang" = "yes"; then if test "$have_clang" = "yes"; then
saved_CFLAGS="$CFLAGS" saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $CFLAGS_FTRAPV" 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=yes; AC_MSG_RESULT([yes])],
[ftrapv_can_link=no; AC_MSG_RESULT([no])]) [ftrapv_can_link=no; AC_MSG_RESULT([no])])
mulodi_fixes_ftrapv=no
if test "$ftrapv_can_link" = "no"; then if test "$ftrapv_can_link" = "no"; then
AC_MSG_CHECKING([whether defining __mulodi4 fixes that]) AC_MSG_CHECKING([whether defining __mulodi4 fixes that])
AC_LINK_IFELSE([ AC_LINK_IFELSE([
@ -837,10 +837,11 @@ if test "$have_clang" = "yes"; then
[mulodi_fixes_ftrapv=yes; AC_MSG_RESULT([yes])], [mulodi_fixes_ftrapv=yes; AC_MSG_RESULT([yes])],
[mulodi_fixes_ftrapv=no; AC_MSG_RESULT([no])]) [mulodi_fixes_ftrapv=no; AC_MSG_RESULT([no])])
fi fi
AM_CONDITIONAL(ADD_MULODI4, test "$mulodi_fixes_ftrapv" = "yes")
CFLAGS="$saved_CFLAGS" CFLAGS="$saved_CFLAGS"
fi 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 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 persuade ourselves that they're suitable for code that needs to be
dnl constant time. dnl constant time.