| Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 1 | From daf90bfa99fc02a253d538c65fbaa12f2e6c1c45 Mon Sep 17 00:00:00 2001 |
| 2 | From: Philip Withnall <pwithnall@endlessos.org> |
| 3 | Date: Wed, 11 Nov 2020 19:23:18 +0000 |
| 4 | Subject: [PATCH 22/29] build: Drop unnecessary volatile qualifiers from |
| 5 | configure tests |
| 6 | |
| 7 | Signed-off-by: Philip Withnall <pwithnall@endlessos.org> |
| 8 | |
| 9 | Helps: #600 |
| 10 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719] |
| 11 | --- |
| 12 | meson.build | 3 ++- |
| 13 | 1 file changed, 2 insertions(+), 1 deletion(-) |
| 14 | |
| 15 | diff --git a/meson.build b/meson.build |
| 16 | index e0b308a25..ad7f887fb 100644 |
| 17 | --- a/meson.build |
| 18 | +++ b/meson.build |
| 19 | @@ -1773,7 +1773,7 @@ endforeach |
| 20 | # that then to silently fall back on emulated atomic ops just because |
| 21 | # the user had the wrong build environment. |
| 22 | atomictest = '''int main() { |
| 23 | - volatile int atomic = 2; |
| 24 | + int atomic = 2; |
| 25 | __sync_bool_compare_and_swap (&atomic, 2, 3); |
| 26 | return 0; |
| 27 | } |
| 28 | @@ -1883,6 +1883,7 @@ endif |
| 29 | |
| 30 | # FIXME: we should make it print the result and always return 0, so that |
| 31 | # the output in meson shows up as green |
| 32 | +# volatile is needed here to avoid optimisations in the test |
| 33 | stack_grows_check_prog = ''' |
| 34 | volatile int *a = 0, *b = 0; |
| 35 | void f (int i) { |
| 36 | -- |
| 37 | 2.30.1 |
| 38 | |