From 527c89cd32f8522859f58343be3d3dc8f754b783 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 21 Jan 2021 18:16:49 +0100 Subject: [PATCH] powerpc64: Select POWER9 machine for the scv instruction It is not available with the baseline ISA. Fixes commit 68ab82f56690ada86ac1e0c46bad06ba189a10ef ("powerpc: Runtime selection between sc and scv for syscalls"). Reviewed-by: Tulio Magno Quites Machado Filho --- sysdeps/powerpc/powerpc64/sysdep.h | 3 +++ sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S | 3 +++ sysdeps/unix/sysv/linux/powerpc/sysdep.h | 5 ++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/sysdeps/powerpc/powerpc64/sysdep.h b/sysdeps/powerpc/powerpc64/sysdep.h index cea05c8e176..c57bb1c05d0 100644 --- a/sysdeps/powerpc/powerpc64/sysdep.h +++ b/sysdeps/powerpc/powerpc64/sysdep.h @@ -333,7 +333,10 @@ LT_LABELSUFFIX(name,_name_end): ; \ mflr r9; \ std r9,FRAME_LR_SAVE(r1); \ cfi_offset(lr,FRAME_LR_SAVE); \ + .machine "push"; \ + .machine "power9"; \ scv 0; \ + .machine "pop"; \ ld r9,FRAME_LR_SAVE(r1); \ mtlr r9; \ cfi_restore(lr); diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S index b59837b071f..e9bd8cb9601 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S @@ -76,7 +76,10 @@ ENTRY (__clone) because it uses CFI directives and we just called cfi_endproc. */ mflr r9 std r9,FRAME_LR_SAVE(r1) + .machine "push" + .machine "power9" scv 0 + .machine "pop" ld r9,FRAME_LR_SAVE(r1) mtlr r9 diff --git a/sysdeps/unix/sysv/linux/powerpc/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/sysdep.h index d3605d562d2..6b99464e61b 100644 --- a/sysdeps/unix/sysv/linux/powerpc/sysdep.h +++ b/sysdeps/unix/sysv/linux/powerpc/sysdep.h @@ -76,7 +76,10 @@ #define SYSCALL_SCV(nr) \ ({ \ __asm__ __volatile__ \ - ("scv 0\n\t" \ + (".machine \"push\"\n\t" \ + ".machine \"power9\"\n\t" \ + "scv 0\n\t" \ + ".machine \"pop\"\n\t" \ "0:" \ : "=&r" (r0), \ "=&r" (r3), "=&r" (r4), "=&r" (r5), \ -- 2.47.2