1 files changed, 31 insertions, 5 deletions

diff --git a/configure.ac b/configure.ac
index 952dec3b8..460c93d50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,12 +3,37 @@ AC_INIT(firejail, 0.9.53, netblue30@yahoo.com, , http://firejail.wordpress.com)
 AC_CONFIG_SRCDIR([src/firejail/main.c])
 #AC_CONFIG_HEADERS([config.h])
 
-
 AC_PROG_CC
 #AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 
+HAVE_SPECTRE="no"
+AC_MSG_CHECKING(for Spectre mitigation support in gcc or clang compiler)
+AS_IF([test "$CC" = "gcc"], [
+        HAVE_SPECTRE="yes"
+        $CC -mindirect-branch=thunk -c dummy.c || HAVE_SPECTRE="no"
+        rm -f dummy.o
+        AS_IF([test "$HAVE_SPECTRE" = "yes"], [
+                EXTRA_CFLAGS+=" -mindirect-branch=thunk "
+        ])
+])
+AS_IF([test "$CC" = "clang"], [
+        HAVE_SPECTRE="yes"
+        $CC -mretpoline -c dummy.c || HAVE_SPECTRE="no"
+        rm -f dummy.o
+        AS_IF([test "$HAVE_SPECTRE" = "yes"], [
+                EXTRA_CFLAGS+=" -mretpoline "
+        ])
+])
+AS_IF([test "$HAVE_SPECTRE" = "yes"], [
+        AC_MSG_RESULT(yes)
+])
+AS_IF([test "$HAVE_SPECTRE" = "no"], [
+        AC_MSG_RESULT(... not available)
+])
+AC_SUBST([EXTRA_CFLAGS])
+
 HAVE_APPARMOR=""
 AC_ARG_ENABLE([apparmor],
     AS_HELP_STRING([--enable-apparmor], [enable apparmor]))
@@ -17,13 +42,12 @@ AS_IF([test "x$enable_apparmor" = "xyes"], [
         AC_SUBST(HAVE_APPARMOR)
 ])
 
-
 AS_IF([test "x$enable_apparmor" = "xyes"], [
         AC_CHECK_HEADER(sys/apparmor.h, , [AC_MSG_ERROR(
         [Couldn't find sys/apparmor.h... please install apparmor user space library and development files] )])
 ])
 AS_IF([test "x$enable_apparmor" = "xyes"], [
-        EXTRA_LDFLAGS+="-lapparmor "
+        EXTRA_LDFLAGS+=" -lapparmor "
 ])
 AC_SUBST([EXTRA_LDFLAGS])
 
@@ -142,7 +166,7 @@ AC_ARG_ENABLE([gcov],
     AS_HELP_STRING([--enable-gcov], [Gcov instrumentation]))
 AS_IF([test "x$enable_gcov" = "xyes"], [
         HAVE_GCOV="--coverage -DHAVE_GCOV "
-        EXTRA_LDFLAGS+="-lgcov --coverage "
+        EXTRA_LDFLAGS+=" -lgcov --coverage "
         AC_SUBST(HAVE_GCOV)
 ])
 
@@ -175,7 +199,7 @@ if test "$prefix" = /usr; then
         sysconfdir="/etc"
 fi
 
-AC_OUTPUT(Makefile src/lib/Makefile src/fcopy/Makefile src/fnet/Makefile src/firejail/Makefile src/fnetfilter/Makefile \
+AC_OUTPUT(Makefile src/common.mk src/lib/Makefile src/fcopy/Makefile src/fnet/Makefile src/firejail/Makefile src/fnetfilter/Makefile \
 src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/fbuilder/Makefile src/fsec-print/Makefile \
 src/ftee/Makefile src/faudit/Makefile src/fseccomp/Makefile src/fldd/Makefile src/libpostexecseccomp/Makefile src/fsec-optimize/Makefile)
 
@@ -198,7 +222,9 @@ echo "   file transfer support: $HAVE_FILE_TRANSFER"
 echo "   overlayfs support: $HAVE_OVERLAYFS"
 echo "   git install support: $HAVE_GIT_INSTALL"
 echo "   busybox workaround: $BUSYBOX_WORKAROUND"
+echo "   Spectre compiler patch: $HAVE_SPECTRE"
 echo "   EXTRA_LDFLAGS: $EXTRA_LDFLAGS"
+echo "   EXTRA_CFLAGS: $EXTRA_CFLAGS"
 echo "   fatal warnings: $HAVE_FATAL_WARNINGS"
 echo "   Gcov instrumentation: $HAVE_GCOV"
 echo "   Install contrib scripts: $HAVE_CONTRIB_INSTALL"