diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2020-10-28 18:41:24 +0100 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2020-10-28 18:41:24 +0100 |
| commit | bf6dad60c338a42a7fb85f7b2a5870c0fb2e20f8 (patch) | |
| tree | e513781ef717465e7db0358e987a5a6cbef5665c /libitm | |
| parent | 0c261d5b5c931d9e9214d06531bdc7e9e16aeaab (diff) | |
| parent | 47d13acbda9a5d8eb57ff169ba74857cd54108e4 (diff) | |
| download | gcc-bf6dad60c338a42a7fb85f7b2a5870c0fb2e20f8.zip gcc-bf6dad60c338a42a7fb85f7b2a5870c0fb2e20f8.tar.gz gcc-bf6dad60c338a42a7fb85f7b2a5870c0fb2e20f8.tar.bz2 | |
Merge branch 'master' into devel/coarray_native.
Merge into devel/coarray_native to prepare for later merging of
coarray_native with master.
Diffstat (limited to 'libitm')
| -rw-r--r-- | libitm/ChangeLog | 4 | ||||
| -rw-r--r-- | libitm/config/powerpc/sjlj.S | 18 |
2 files changed, 21 insertions, 1 deletions
diff --git a/libitm/ChangeLog b/libitm/ChangeLog index aa6de59..02aadfe 100644 --- a/libitm/ChangeLog +++ b/libitm/ChangeLog @@ -1,3 +1,7 @@ +2020-10-01 Alan Modra <amodra@gmail.com> + + * config/powerpc/sjlj.S: Support __PCREL__ code. + 2020-07-24 Szabolcs Nagy <szabolcs.nagy@arm.com> * config/aarch64/sjlj.S: Add conditional pac-ret protection. diff --git a/libitm/config/powerpc/sjlj.S b/libitm/config/powerpc/sjlj.S index a963fc3..bcb0e73 100644 --- a/libitm/config/powerpc/sjlj.S +++ b/libitm/config/powerpc/sjlj.S @@ -26,7 +26,23 @@ #include "asmcfi.h" -#if defined(__powerpc64__) && _CALL_ELF == 2 +#if defined(__powerpc64__) && _CALL_ELF == 2 && defined(__PCREL__) +.macro FUNC name + .globl \name + .type \name, @function +\name: + .localentry \name, 1 +.endm +.macro END name + .size \name, . - \name +.endm +.macro HIDDEN name + .hidden \name +.endm +.macro CALL name + bl \name @notoc +.endm +#elif defined(__powerpc64__) && _CALL_ELF == 2 .macro FUNC name .globl \name .type \name, @function |