diff options
-rwxr-xr-x | configure | 21 | ||||
-rw-r--r-- | configure.ac | 38 |
2 files changed, 36 insertions, 23 deletions
@@ -2914,7 +2914,9 @@ fi | |||
2914 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mindirect_branch_thunk" >&5 | 2914 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mindirect_branch_thunk" >&5 |
2915 | $as_echo "$ax_cv_check_cflags___mindirect_branch_thunk" >&6; } | 2915 | $as_echo "$ax_cv_check_cflags___mindirect_branch_thunk" >&6; } |
2916 | if test "x$ax_cv_check_cflags___mindirect_branch_thunk" = xyes; then : | 2916 | if test "x$ax_cv_check_cflags___mindirect_branch_thunk" = xyes; then : |
2917 | HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -mindirect-branch=thunk" | 2917 | |
2918 | HAVE_SPECTRE="yes" | ||
2919 | EXTRA_CFLAGS="$EXTRA_CFLAGS -mindirect-branch=thunk" | ||
2918 | 2920 | ||
2919 | else | 2921 | else |
2920 | : | 2922 | : |
@@ -2950,7 +2952,9 @@ fi | |||
2950 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mretpoline" >&5 | 2952 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mretpoline" >&5 |
2951 | $as_echo "$ax_cv_check_cflags___mretpoline" >&6; } | 2953 | $as_echo "$ax_cv_check_cflags___mretpoline" >&6; } |
2952 | if test "x$ax_cv_check_cflags___mretpoline" = xyes; then : | 2954 | if test "x$ax_cv_check_cflags___mretpoline" = xyes; then : |
2953 | HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -mretpoline" | 2955 | |
2956 | HAVE_SPECTRE="yes" | ||
2957 | EXTRA_CFLAGS="$EXTRA_CFLAGS -mretpoline" | ||
2954 | 2958 | ||
2955 | else | 2959 | else |
2956 | : | 2960 | : |
@@ -2986,7 +2990,9 @@ fi | |||
2986 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fstack_clash_protection" >&5 | 2990 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fstack_clash_protection" >&5 |
2987 | $as_echo "$ax_cv_check_cflags___fstack_clash_protection" >&6; } | 2991 | $as_echo "$ax_cv_check_cflags___fstack_clash_protection" >&6; } |
2988 | if test "x$ax_cv_check_cflags___fstack_clash_protection" = xyes; then : | 2992 | if test "x$ax_cv_check_cflags___fstack_clash_protection" = xyes; then : |
2989 | HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-clash-protection" | 2993 | |
2994 | HAVE_SPECTRE="yes" | ||
2995 | EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-clash-protection" | ||
2990 | 2996 | ||
2991 | else | 2997 | else |
2992 | : | 2998 | : |
@@ -3022,7 +3028,9 @@ fi | |||
3022 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fstack_protector_strong" >&5 | 3028 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fstack_protector_strong" >&5 |
3023 | $as_echo "$ax_cv_check_cflags___fstack_protector_strong" >&6; } | 3029 | $as_echo "$ax_cv_check_cflags___fstack_protector_strong" >&6; } |
3024 | if test "x$ax_cv_check_cflags___fstack_protector_strong" = xyes; then : | 3030 | if test "x$ax_cv_check_cflags___fstack_protector_strong" = xyes; then : |
3025 | HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-protector-strong" | 3031 | |
3032 | HAVE_SPECTRE="yes" | ||
3033 | EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-protector-strong" | ||
3026 | 3034 | ||
3027 | else | 3035 | else |
3028 | : | 3036 | : |
@@ -3323,7 +3331,10 @@ else | |||
3323 | AA_LIBS=$pkg_cv_AA_LIBS | 3331 | AA_LIBS=$pkg_cv_AA_LIBS |
3324 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | 3332 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
3325 | $as_echo "yes" >&6; } | 3333 | $as_echo "yes" >&6; } |
3326 | EXTRA_CFLAGS="$EXTRA_CFLAGS $AA_CFLAGS" && EXTRA_LDFLAGS="$EXTRA_LDFLAGS $AA_LIBS" | 3334 | |
3335 | EXTRA_CFLAGS="$EXTRA_CFLAGS $AA_CFLAGS" | ||
3336 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS $AA_LIBS" | ||
3337 | |||
3327 | fi | 3338 | fi |
3328 | 3339 | ||
3329 | fi | 3340 | fi |
diff --git a/configure.ac b/configure.ac index a78688e09..9cc20d94a 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -21,22 +21,22 @@ AC_CONFIG_MACRO_DIR([m4]) | |||
21 | AC_PROG_CC | 21 | AC_PROG_CC |
22 | 22 | ||
23 | HAVE_SPECTRE="no" | 23 | HAVE_SPECTRE="no" |
24 | AX_CHECK_COMPILE_FLAG( | 24 | AX_CHECK_COMPILE_FLAG([-mindirect-branch=thunk], [ |
25 | [-mindirect-branch=thunk], | 25 | HAVE_SPECTRE="yes" |
26 | [HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -mindirect-branch=thunk"] | 26 | EXTRA_CFLAGS="$EXTRA_CFLAGS -mindirect-branch=thunk" |
27 | ) | 27 | ]) |
28 | AX_CHECK_COMPILE_FLAG( | 28 | AX_CHECK_COMPILE_FLAG([-mretpoline], [ |
29 | [-mretpoline], | 29 | HAVE_SPECTRE="yes" |
30 | [HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -mretpoline"] | 30 | EXTRA_CFLAGS="$EXTRA_CFLAGS -mretpoline" |
31 | ) | 31 | ]) |
32 | AX_CHECK_COMPILE_FLAG( | 32 | AX_CHECK_COMPILE_FLAG([-fstack-clash-protection], [ |
33 | [-fstack-clash-protection], | 33 | HAVE_SPECTRE="yes" |
34 | [HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-clash-protection"] | 34 | EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-clash-protection" |
35 | ) | 35 | ]) |
36 | AX_CHECK_COMPILE_FLAG( | 36 | AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [ |
37 | [-fstack-protector-strong], | 37 | HAVE_SPECTRE="yes" |
38 | [HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-protector-strong"] | 38 | EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-protector-strong" |
39 | ) | 39 | ]) |
40 | 40 | ||
41 | AC_ARG_ENABLE([analyzer], | 41 | AC_ARG_ENABLE([analyzer], |
42 | [AS_HELP_STRING([--enable-analyzer], [enable GCC static analyzer])]) | 42 | [AS_HELP_STRING([--enable-analyzer], [enable GCC static analyzer])]) |
@@ -68,8 +68,10 @@ AC_ARG_ENABLE([apparmor], | |||
68 | [AS_HELP_STRING([--enable-apparmor], [enable apparmor])]) | 68 | [AS_HELP_STRING([--enable-apparmor], [enable apparmor])]) |
69 | AS_IF([test "x$enable_apparmor" = "xyes"], [ | 69 | AS_IF([test "x$enable_apparmor" = "xyes"], [ |
70 | HAVE_APPARMOR="-DHAVE_APPARMOR" | 70 | HAVE_APPARMOR="-DHAVE_APPARMOR" |
71 | PKG_CHECK_MODULES([AA], [libapparmor], | 71 | PKG_CHECK_MODULES([AA], [libapparmor], [ |
72 | [EXTRA_CFLAGS="$EXTRA_CFLAGS $AA_CFLAGS" && EXTRA_LDFLAGS="$EXTRA_LDFLAGS $AA_LIBS"]) | 72 | EXTRA_CFLAGS="$EXTRA_CFLAGS $AA_CFLAGS" |
73 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS $AA_LIBS" | ||
74 | ]) | ||
73 | ]) | 75 | ]) |
74 | 76 | ||
75 | HAVE_SELINUX="" | 77 | HAVE_SELINUX="" |