From a33d347c181cfa0d84c37e9961ebf030495ed248 Mon Sep 17 00:00:00 2001 From: "Paul E. Murphy" <murphyp@linux.vnet.ibm.com> Date: Wed, 20 Jan 2016 10:33:19 -0600 Subject: [PATCH 42/65] powerpc: Fix macro usage of htm builtins Some extraneous semicolons were included in a recent patch which causes a build failure with newer compilers. (cherry picked from commit af8ea0f449af7d3847351a4a5bafcd435a22ac31) --- ChangeLog | 7 +++++++ sysdeps/unix/sysv/linux/powerpc/htm.h | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5887ea1..c0f411e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2016-02-22 Paul E. Murphy <murphyp@linux.vnet.ibm.com> + + * sysdeps/unix/sysv/linux/powerpc/htm.h (__libc_tbegin): Remove + semicolon. + (__libc_tend): Likewise. + (__libc_tabort): Likewise. + 2016-02-22 Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> * sysdeps/unix/sysv/linux/powerpc/htm.h (__libc_tbegin, diff --git a/sysdeps/unix/sysv/linux/powerpc/htm.h b/sysdeps/unix/sysv/linux/powerpc/htm.h index f9a2587..7b49817 100644 --- a/sysdeps/unix/sysv/linux/powerpc/htm.h +++ b/sysdeps/unix/sysv/linux/powerpc/htm.h @@ -128,9 +128,9 @@ # ifdef __TM_FENCE__ /* New GCC behavior. */ -# define __libc_tbegin(R) __builtin_tbegin (R); -# define __libc_tend(R) __builtin_tend (R); -# define __libc_tabort(R) __builtin_tabort (R); +# define __libc_tbegin(R) __builtin_tbegin (R) +# define __libc_tend(R) __builtin_tend (R) +# define __libc_tabort(R) __builtin_tabort (R) # else /* Workaround an old GCC behavior. Earlier releases of GCC 4.9 and 5.0, didn't use to treat __builtin_tbegin, __builtin_tend and -- 2.7.4