diff options
| -rw-r--r-- | lib/csu/aarch64/md_init.h | 6 | ||||
| -rw-r--r-- | lib/libc/arch/aarch64/SYS.h | 6 | ||||
| -rw-r--r-- | libexec/ld.so/aarch64/SYS.h | 6 | ||||
| -rw-r--r-- | libexec/ld.so/aarch64/rtld_machine.c | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/lib/csu/aarch64/md_init.h b/lib/csu/aarch64/md_init.h index 48d0f29da96..36f475682b4 100644 --- a/lib/csu/aarch64/md_init.h +++ b/lib/csu/aarch64/md_init.h @@ -1,4 +1,4 @@ -/* $OpenBSD: md_init.h,v 1.6 2020/01/26 02:19:43 kettenis Exp $ */ +/* $OpenBSD: md_init.h,v 1.7 2020/02/18 12:19:11 kettenis Exp $ */ /*- * Copyright (c) 2001 Ross Harvey @@ -113,6 +113,6 @@ "_dl_exit: \n" \ " mov x8, #1 \n" \ " svc #0 \n" \ - " nop \n" \ - " nop \n" \ + " dsb nsh \n" \ + " isb \n" \ ".previous"); diff --git a/lib/libc/arch/aarch64/SYS.h b/lib/libc/arch/aarch64/SYS.h index ce3c38aa30a..0c5fd4572a3 100644 --- a/lib/libc/arch/aarch64/SYS.h +++ b/lib/libc/arch/aarch64/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.4 2020/01/26 02:19:43 kettenis Exp $ */ +/* $OpenBSD: SYS.h,v 1.5 2020/02/18 12:19:11 kettenis Exp $ */ /* $NetBSD: SYS.h,v 1.8 2003/08/07 16:42:02 agc Exp $ */ /*- @@ -54,8 +54,8 @@ #define SYSTRAP(x) \ ldr x8, =SYS_ ## x; \ svc 0; \ - nop; \ - nop + dsb nsh; \ + isb #define CERROR _C_LABEL(__cerror) diff --git a/libexec/ld.so/aarch64/SYS.h b/libexec/ld.so/aarch64/SYS.h index 46ed6aca5c0..08ec2a7b300 100644 --- a/libexec/ld.so/aarch64/SYS.h +++ b/libexec/ld.so/aarch64/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.4 2020/01/26 02:19:44 kettenis Exp $ */ +/* $OpenBSD: SYS.h,v 1.5 2020/02/18 12:19:11 kettenis Exp $ */ /* * Copyright (c) 2016 Dale Rahn @@ -32,8 +32,8 @@ #define SYSTRAP(x) \ ldr x8, =SYS_ ## x ;\ svc 0 ;\ - nop ;\ - nop + dsb nsh ;\ + isb #define DL_SYSCALL(n) \ .global __CONCAT(_dl_,n) ;\ diff --git a/libexec/ld.so/aarch64/rtld_machine.c b/libexec/ld.so/aarch64/rtld_machine.c index d466b5a1776..eac2a0cd124 100644 --- a/libexec/ld.so/aarch64/rtld_machine.c +++ b/libexec/ld.so/aarch64/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.19 2020/01/26 02:19:44 kettenis Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.20 2020/02/18 12:19:11 kettenis Exp $ */ /* * Copyright (c) 2004 Dale Rahn @@ -300,7 +300,7 @@ _dl_bind(elf_object_t *object, int relidx) register long arg2 __asm("x1") = sizeof(buf); register long arg3 __asm("x2") = cookie; - __asm volatile("svc 0; nop; nop" : "+r" (arg1), "+r" (arg2) + __asm volatile("svc 0; dsb nsh; isb" : "+r" (arg1), "+r" (arg2) : "r" (syscall_num), "r" (arg3) : "cc", "memory"); } |