Fix ppc macro usage of htm builtins
Commit Message
Some extraneous semicolons were included in a
recent patch which causes a build failure with
newer compilers.
2016-01-19 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.
---
sysdeps/unix/sysv/linux/powerpc/htm.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Comments
On Wed, 2016-01-20 at 10:33 -0600, Paul E. Murphy wrote:
> Some extraneous semicolons were included in a
> recent patch which causes a build failure with
> newer compilers.
>
> 2016-01-19 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.
> ---
> sysdeps/unix/sysv/linux/powerpc/htm.h | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/sysdeps/unix/sysv/linux/powerpc/htm.h b/sysdeps/unix/sysv/linux/powerpc/htm.h
> index 16b2237..29cda8a 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
LGTM. We're in hard freeze, but I suppose such obvious fixes that
unbreak builds can go in?
On 20-01-2016 15:55, Torvald Riegel wrote:
> On Wed, 2016-01-20 at 10:33 -0600, Paul E. Murphy wrote:
>> Some extraneous semicolons were included in a
>> recent patch which causes a build failure with
>> newer compilers.
>>
>> 2016-01-19 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.
>> ---
>> sysdeps/unix/sysv/linux/powerpc/htm.h | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/sysdeps/unix/sysv/linux/powerpc/htm.h b/sysdeps/unix/sysv/linux/powerpc/htm.h
>> index 16b2237..29cda8a 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
>
> LGTM. We're in hard freeze, but I suppose such obvious fixes that
> unbreak builds can go in?
>
Yes, I agree with Joseph [1] that build breakage should be allow in hard freeze.
[1] https://sourceware.org/ml/libc-alpha/2016-01/msg00513.html
"Paul E. Murphy" <murphyp@linux.vnet.ibm.com> writes:
> Some extraneous semicolons were included in a
> recent patch which causes a build failure with
> newer compilers.
Thanks for catching this!
Pushed to 2.23 as commit af8ea0f4.
@@ -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