diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-06-20 05:26:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-20 05:26:23 +0000 |
commit | a8f01a383a2a4ec81bdf09e504b49e93881d62c6 (patch) | |
tree | 0eb833dc30f0bba4144e7fcbcba2c564637b9f44 | |
parent | build(deps): bump github/codeql-action from 2.3.6 to 2.20.0 (diff) | |
parent | build: remove -mretpoline and NO_EXTRA_CFLAGS (diff) | |
download | firejail-a8f01a383a2a4ec81bdf09e504b49e93881d62c6.tar.gz firejail-a8f01a383a2a4ec81bdf09e504b49e93881d62c6.tar.zst firejail-a8f01a383a2a4ec81bdf09e504b49e93881d62c6.zip |
Merge pull request #5859 from kmk3/build-remove-retpoline
build: remove -mretpoline and NO_EXTRA_CFLAGS
-rw-r--r-- | .github/workflows/build-extra.yml | 2 | ||||
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | config.mk.in | 4 | ||||
-rwxr-xr-x | configure | 38 | ||||
-rw-r--r-- | configure.ac | 4 |
5 files changed, 2 insertions, 48 deletions
diff --git a/.github/workflows/build-extra.yml b/.github/workflows/build-extra.yml index caa09e4de..dd0dc4da0 100644 --- a/.github/workflows/build-extra.yml +++ b/.github/workflows/build-extra.yml | |||
@@ -105,7 +105,7 @@ jobs: | |||
105 | --enable-selinux | 105 | --enable-selinux |
106 | || (cat config.log; exit 1) | 106 | || (cat config.log; exit 1) |
107 | - name: scan-build | 107 | - name: scan-build |
108 | run: NO_EXTRA_CFLAGS="yes" scan-build-14 --status-bugs make | 108 | run: scan-build-14 --status-bugs make |
109 | cppcheck: | 109 | cppcheck: |
110 | runs-on: ubuntu-22.04 | 110 | runs-on: ubuntu-22.04 |
111 | steps: | 111 | steps: |
@@ -358,7 +358,7 @@ cppcheck: clean | |||
358 | 358 | ||
359 | .PHONY: scan-build | 359 | .PHONY: scan-build |
360 | scan-build: clean | 360 | scan-build: clean |
361 | NO_EXTRA_CFLAGS="yes" scan-build make | 361 | scan-build make |
362 | 362 | ||
363 | .PHONY: codespell | 363 | .PHONY: codespell |
364 | codespell: clean | 364 | codespell: clean |
diff --git a/config.mk.in b/config.mk.in index 6b6cf1b99..dea3d8a52 100644 --- a/config.mk.in +++ b/config.mk.in | |||
@@ -61,9 +61,5 @@ LDFLAGS=@LDFLAGS@ | |||
61 | # Project variables | 61 | # Project variables |
62 | LIBS=@LIBS@ | 62 | LIBS=@LIBS@ |
63 | 63 | ||
64 | ifdef NO_EXTRA_CFLAGS | ||
65 | else | ||
66 | EXTRA_CFLAGS +=@EXTRA_CFLAGS@ | 64 | EXTRA_CFLAGS +=@EXTRA_CFLAGS@ |
67 | endif | ||
68 | |||
69 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ | 65 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ |
@@ -2925,44 +2925,6 @@ else | |||
2925 | : | 2925 | : |
2926 | fi | 2926 | fi |
2927 | 2927 | ||
2928 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -mretpoline" >&5 | ||
2929 | $as_echo_n "checking whether C compiler accepts -mretpoline... " >&6; } | ||
2930 | if ${ax_cv_check_cflags___mretpoline+:} false; then : | ||
2931 | $as_echo_n "(cached) " >&6 | ||
2932 | else | ||
2933 | |||
2934 | ax_check_save_flags=$CFLAGS | ||
2935 | CFLAGS="$CFLAGS -mretpoline" | ||
2936 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
2937 | /* end confdefs.h. */ | ||
2938 | |||
2939 | int | ||
2940 | main () | ||
2941 | { | ||
2942 | |||
2943 | ; | ||
2944 | return 0; | ||
2945 | } | ||
2946 | _ACEOF | ||
2947 | if ac_fn_c_try_compile "$LINENO"; then : | ||
2948 | ax_cv_check_cflags___mretpoline=yes | ||
2949 | else | ||
2950 | ax_cv_check_cflags___mretpoline=no | ||
2951 | fi | ||
2952 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2953 | CFLAGS=$ax_check_save_flags | ||
2954 | fi | ||
2955 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mretpoline" >&5 | ||
2956 | $as_echo "$ax_cv_check_cflags___mretpoline" >&6; } | ||
2957 | if test "x$ax_cv_check_cflags___mretpoline" = xyes; then : | ||
2958 | |||
2959 | HAVE_SPECTRE="yes" | ||
2960 | EXTRA_CFLAGS="$EXTRA_CFLAGS -mretpoline" | ||
2961 | |||
2962 | else | ||
2963 | : | ||
2964 | fi | ||
2965 | |||
2966 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fstack-clash-protection" >&5 | 2928 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fstack-clash-protection" >&5 |
2967 | $as_echo_n "checking whether C compiler accepts -fstack-clash-protection... " >&6; } | 2929 | $as_echo_n "checking whether C compiler accepts -fstack-clash-protection... " >&6; } |
2968 | if ${ax_cv_check_cflags___fstack_clash_protection+:} false; then : | 2930 | if ${ax_cv_check_cflags___fstack_clash_protection+:} false; then : |
diff --git a/configure.ac b/configure.ac index 30b031801..93de61b95 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -25,10 +25,6 @@ AX_CHECK_COMPILE_FLAG([-mindirect-branch=thunk], [ | |||
25 | HAVE_SPECTRE="yes" | 25 | HAVE_SPECTRE="yes" |
26 | EXTRA_CFLAGS="$EXTRA_CFLAGS -mindirect-branch=thunk" | 26 | EXTRA_CFLAGS="$EXTRA_CFLAGS -mindirect-branch=thunk" |
27 | ]) | 27 | ]) |
28 | AX_CHECK_COMPILE_FLAG([-mretpoline], [ | ||
29 | HAVE_SPECTRE="yes" | ||
30 | EXTRA_CFLAGS="$EXTRA_CFLAGS -mretpoline" | ||
31 | ]) | ||
32 | AX_CHECK_COMPILE_FLAG([-fstack-clash-protection], [ | 28 | AX_CHECK_COMPILE_FLAG([-fstack-clash-protection], [ |
33 | HAVE_SPECTRE="yes" | 29 | HAVE_SPECTRE="yes" |
34 | EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-clash-protection" | 30 | EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-clash-protection" |