From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 008363A51412; Fri, 13 Nov 2020 14:21:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 008363A51412 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc] powerpc: Eliminate UP macro conditionals X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/master X-Git-Oldrev: 0f34d426acf8950599ab8a1e6a733fe4c40903a4 X-Git-Newrev: d5c4cce9c3eb82cb57d01a3ce3a0999e146abd63 Message-Id: <20201113142115.008363A51412@sourceware.org> Date: Fri, 13 Nov 2020 14:21:14 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Nov 2020 14:21:15 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d5c4cce9c3eb82cb57d01a3ce3a0999e146abd63 commit d5c4cce9c3eb82cb57d01a3ce3a0999e146abd63 Author: Florian Weimer Date: Fri Nov 13 15:19:41 2020 +0100 powerpc: Eliminate UP macro conditionals The macro is never defined. Reviewed-by: Adhemerval Zanella Diff: --- sysdeps/powerpc/atomic-machine.h | 11 +++-------- sysdeps/powerpc/powerpc32/atomic-machine.h | 4 +--- sysdeps/powerpc/powerpc64/atomic-machine.h | 4 +--- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/sysdeps/powerpc/atomic-machine.h b/sysdeps/powerpc/atomic-machine.h index bd357a44a6..4feb21532f 100644 --- a/sysdeps/powerpc/atomic-machine.h +++ b/sysdeps/powerpc/atomic-machine.h @@ -53,14 +53,9 @@ typedef uintmax_t uatomic_max_t; #define __arch_compare_and_exchange_bool_16_acq(mem, newval, oldval) \ (abort (), 0) -#ifdef UP -# define __ARCH_ACQ_INSTR "" -# define __ARCH_REL_INSTR "" -#else -# define __ARCH_ACQ_INSTR "isync" -# ifndef __ARCH_REL_INSTR -# define __ARCH_REL_INSTR "sync" -# endif +#define __ARCH_ACQ_INSTR "isync" +#ifndef __ARCH_REL_INSTR +# define __ARCH_REL_INSTR "sync" #endif #ifndef MUTEX_HINT_ACQ diff --git a/sysdeps/powerpc/powerpc32/atomic-machine.h b/sysdeps/powerpc/powerpc32/atomic-machine.h index 61c794991c..066759d097 100644 --- a/sysdeps/powerpc/powerpc32/atomic-machine.h +++ b/sysdeps/powerpc/powerpc32/atomic-machine.h @@ -105,9 +105,7 @@ /* * "light weight" sync can also be used for the release barrier. */ -# ifndef UP -# define __ARCH_REL_INSTR "lwsync" -# endif +# define __ARCH_REL_INSTR "lwsync" # define atomic_write_barrier() __asm ("lwsync" ::: "memory") #else /* diff --git a/sysdeps/powerpc/powerpc64/atomic-machine.h b/sysdeps/powerpc/powerpc64/atomic-machine.h index 421dbd10c4..c9372a8e9e 100644 --- a/sysdeps/powerpc/powerpc64/atomic-machine.h +++ b/sysdeps/powerpc/powerpc64/atomic-machine.h @@ -230,9 +230,7 @@ /* * "light weight" sync can also be used for the release barrier. */ -#ifndef UP -# define __ARCH_REL_INSTR "lwsync" -#endif +#define __ARCH_REL_INSTR "lwsync" #define atomic_write_barrier() __asm ("lwsync" ::: "memory") /*