diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/sysdep.h | 5 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/sysdep.h | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/not-errno.h | 30 |
4 files changed, 47 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 9aa71ddc2d..cb9e14c2f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2018-01-19 Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> + + [BZ #22685] + * sysdeps/powerpc/powerpc32/sysdep.h (ABORT_TRANSACTION_IMPL): Renamed + from ABORT_TRANSACTION. + (ABORT_TRANSACTION): Redirect to ABORT_TRANSACTION_IMPL. + * sysdeps/powerpc/powerpc64/sysdep.h (ABORT_TRANSACTION, + ABORT_TRANSACTION_IMPL): Likewise. + * sysdeps/unix/sysv/linux/powerpc/not-errno.h: New file. Reuse + Linux code, but remove the code that aborts transactions. + 2018-01-19 Samuel Thibault <samuel.thibault@ens-lyon.org> * sysdeps/generic/netinet/if_ether.h: Include <stdint.h>. diff --git a/sysdeps/powerpc/powerpc32/sysdep.h b/sysdeps/powerpc/powerpc32/sysdep.h index 62c018f27e..8e32a2a131 100644 --- a/sysdeps/powerpc/powerpc32/sysdep.h +++ b/sysdeps/powerpc/powerpc32/sysdep.h @@ -91,7 +91,7 @@ GOT_LABEL: ; \ ASM_SIZE_DIRECTIVE(name) #if ! IS_IN(rtld) -# define ABORT_TRANSACTION \ +# define ABORT_TRANSACTION_IMPL \ cmpwi 2,0; \ beq 1f; \ lwz 0,TM_CAPABLE(2); \ @@ -102,8 +102,9 @@ GOT_LABEL: ; \ .align 4; \ 1: #else -# define ABORT_TRANSACTION +# define ABORT_TRANSACTION_IMPL #endif +#define ABORT_TRANSACTION ABORT_TRANSACTION_IMPL #define DO_CALL(syscall) \ ABORT_TRANSACTION \ diff --git a/sysdeps/powerpc/powerpc64/sysdep.h b/sysdeps/powerpc/powerpc64/sysdep.h index 26b088517f..2df1d9b6e6 100644 --- a/sysdeps/powerpc/powerpc64/sysdep.h +++ b/sysdeps/powerpc/powerpc64/sysdep.h @@ -264,7 +264,7 @@ LT_LABELSUFFIX(name,_name_end): ; \ END_2(name) #if !IS_IN(rtld) -# define ABORT_TRANSACTION \ +# define ABORT_TRANSACTION_IMPL \ cmpdi 13,0; \ beq 1f; \ lwz 0,TM_CAPABLE(13); \ @@ -275,8 +275,9 @@ LT_LABELSUFFIX(name,_name_end): ; \ .p2align 4; \ 1: #else -# define ABORT_TRANSACTION +# define ABORT_TRANSACTION_IMPL #endif +#define ABORT_TRANSACTION ABORT_TRANSACTION_IMPL #define DO_CALL(syscall) \ ABORT_TRANSACTION \ diff --git a/sysdeps/unix/sysv/linux/powerpc/not-errno.h b/sysdeps/unix/sysv/linux/powerpc/not-errno.h new file mode 100644 index 0000000000..27da21bdf1 --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/not-errno.h @@ -0,0 +1,30 @@ +/* Syscall wrapper that do not set errno. Linux powerpc version. + Copyright (C) 2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +/* __access_noerrno is used during process initialization in elf/dl-tunables.c + before the TCB is initialized, prohibiting the usage of + ABORT_TRANSACTION. */ +#undef ABORT_TRANSACTION +#define ABORT_TRANSACTION + +#include "sysdeps/unix/sysv/linux/not-errno.h" + +/* Recover ABORT_TRANSACTION's previous value, in order to not affect + other syscalls. */ +#undef ABORT_TRANSACTION +#define ABORT_TRANSACTION ABORT_TRANSACTION_IMPL |