[glib/glib-2-58] Merge branch 'master' into 'master'

[Xavier Claessens <xclaesse src gnome org>]

commit 68203b1665625616f6966cbdc853175b8fa05f5a
Author: Xavier Claessens <xclaesse gmail com>
Date:   Tue Nov 13 18:47:29 2018 +0000

    Merge branch 'master' into 'master'
    
    meson: add aarch64 memory barrier handling
    
    See merge request GNOME/glib!462
    
    (cherry picked from commit a72766bb9c947ad53c904bd57a69ae3f495c459e)
    
    704522c5 meson: add aarch64 memory barrier handling

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index dd323f9e8..877adc938 100644
--- a/meson.build
+++ b/meson.build
@@ -1526,7 +1526,7 @@ endforeach
 
 # We need a more robust approach here...
 host_cpu_family = host_machine.cpu_family()
-if host_cpu_family == 'x86' or host_cpu_family == 'x86_64' or host_cpu_family == 's390' or host_cpu_family 
== 's390x' or host_cpu_family.startswith('arm') or host_cpu_family.startswith('crisv32') or 
host_cpu_family.startswith('etrax')
+if host_cpu_family == 'x86' or host_cpu_family == 'x86_64' or host_cpu_family == 's390' or host_cpu_family 
== 's390x' or host_cpu_family.startswith('arm') or host_cpu_family == 'aarch64' or 
host_cpu_family.startswith('crisv32') or host_cpu_family.startswith('etrax')
   glib_memory_barrier_needed = false
 elif host_cpu_family.startswith('sparc') or host_cpu_family.startswith('alpha') or 
host_cpu_family.startswith('powerpc') or host_cpu_family == 'ia64'
   glib_memory_barrier_needed = true