alpha: Remove UP preprocessor conditionals

Message ID 87o8k1tr2o.fsf@oldenburg2.str.redhat.com
State Committed
Commit 4d5297253e6743f274580c6c8ca14b1f3b04f0e3
Headers
Series alpha: Remove UP preprocessor conditionals |

Commit Message

Florian Weimer Nov. 13, 2020, 11:49 a.m. UTC
  The macro is never defined.

---
 sysdeps/alpha/atomic-machine.h | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)
  

Comments

Adhemerval Zanella Nov. 13, 2020, 1:47 p.m. UTC | #1
On 13/11/2020 08:49, Florian Weimer via Libc-alpha wrote:
> The macro is never defined.
> 

LGTM, thanks.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

> ---
>  sysdeps/alpha/atomic-machine.h | 14 ++++----------
>  1 file changed, 4 insertions(+), 10 deletions(-)
> 
> diff --git a/sysdeps/alpha/atomic-machine.h b/sysdeps/alpha/atomic-machine.h
> index 3dc0133512..0904ed5688 100644
> --- a/sysdeps/alpha/atomic-machine.h
> +++ b/sysdeps/alpha/atomic-machine.h
> @@ -49,11 +49,7 @@ typedef uintmax_t uatomic_max_t;
>  #define ATOMIC_EXCHANGE_USES_CAS 1
>  
>  
> -#ifdef UP
> -# define __MB		/* nothing */
> -#else
> -# define __MB		"	mb\n"
> -#endif
> +#define __MB		"	mb\n"
>  
>  
>  /* Compare and exchange.  For all of the "xxx" routines, we expect a
> @@ -363,8 +359,6 @@ typedef uintmax_t uatomic_max_t;
>  
>  */
>  
> -#ifndef UP
> -# define atomic_full_barrier()	__asm ("mb" : : : "memory");
> -# define atomic_read_barrier()	__asm ("mb" : : : "memory");
> -# define atomic_write_barrier()	__asm ("wmb" : : : "memory");
> -#endif
> +#define atomic_full_barrier()	__asm ("mb" : : : "memory");
> +#define atomic_read_barrier()	__asm ("mb" : : : "memory");
> +#define atomic_write_barrier()	__asm ("wmb" : : : "memory");
>
  

Patch

diff --git a/sysdeps/alpha/atomic-machine.h b/sysdeps/alpha/atomic-machine.h
index 3dc0133512..0904ed5688 100644
--- a/sysdeps/alpha/atomic-machine.h
+++ b/sysdeps/alpha/atomic-machine.h
@@ -49,11 +49,7 @@  typedef uintmax_t uatomic_max_t;
 #define ATOMIC_EXCHANGE_USES_CAS 1
 
 
-#ifdef UP
-# define __MB		/* nothing */
-#else
-# define __MB		"	mb\n"
-#endif
+#define __MB		"	mb\n"
 
 
 /* Compare and exchange.  For all of the "xxx" routines, we expect a
@@ -363,8 +359,6 @@  typedef uintmax_t uatomic_max_t;
 
 */
 
-#ifndef UP
-# define atomic_full_barrier()	__asm ("mb" : : : "memory");
-# define atomic_read_barrier()	__asm ("mb" : : : "memory");
-# define atomic_write_barrier()	__asm ("wmb" : : : "memory");
-#endif
+#define atomic_full_barrier()	__asm ("mb" : : : "memory");
+#define atomic_read_barrier()	__asm ("mb" : : : "memory");
+#define atomic_write_barrier()	__asm ("wmb" : : : "memory");