mirror of
				https://gitlab.gnome.org/GNOME/glib.git
				synced 2025-11-03 17:48:56 +01:00 
			
		
		
		
	build: Drop unused G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
				
					
				
			See the previous commit. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #1323
This commit is contained in:
		@@ -147,7 +147,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr;
 | 
			
		||||
#define G_THREADS_ENABLED
 | 
			
		||||
#define G_THREADS_IMPL_@g_threads_impl_def@
 | 
			
		||||
 | 
			
		||||
#mesondefine G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
 | 
			
		||||
#mesondefine G_ATOMIC_LOCK_FREE
 | 
			
		||||
 | 
			
		||||
#define GINT16_TO_@g_bs_native@(val)	((gint16) (val))
 | 
			
		||||
 
 | 
			
		||||
@@ -105,7 +105,7 @@ foreach test_name, extra_args : gobject_tests
 | 
			
		||||
 | 
			
		||||
  # FIXME: https://gitlab.gnome.org/GNOME/glib/issues/1316
 | 
			
		||||
  # aka https://bugs.debian.org/880883
 | 
			
		||||
  if test_name == 'closure-refcount' and ['arm', 'aarch64'].contains(host_cpu_family)
 | 
			
		||||
  if test_name == 'closure-refcount' and ['arm', 'aarch64'].contains(host_machine.cpu_family())
 | 
			
		||||
    timeout = timeout * 10
 | 
			
		||||
  endif
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										12
									
								
								meson.build
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								meson.build
									
									
									
									
									
								
							@@ -1676,18 +1676,6 @@ foreach d : inet_defines
 | 
			
		||||
  glibconfig_conf.set(d[1], val)
 | 
			
		||||
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 == '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
 | 
			
		||||
else
 | 
			
		||||
  warning('Unknown host cpu: ' + host_cpu_family)
 | 
			
		||||
  glib_memory_barrier_needed = true
 | 
			
		||||
endif
 | 
			
		||||
glibconfig_conf.set('G_ATOMIC_OP_MEMORY_BARRIER_NEEDED', glib_memory_barrier_needed)
 | 
			
		||||
 | 
			
		||||
# We need to decide at configure time if GLib will use real atomic
 | 
			
		||||
# operations ("lock free") or emulated ones with a mutex.  This is
 | 
			
		||||
# because we must put this information in glibconfig.h so we know if
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user