diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2014-04-16 10:53:00 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2014-04-16 10:53:00 +0000 |
| commit | f835eee727683f1f21e319510529b3bf48777c3f (patch) | |
| tree | 70f76dfe8492b6164f6cf7826c02b60ff5c3d11c /libexec/ld.so/alpha | |
| parent | b1a666f460d2902ea198f04cf4474df05380d7f2 (diff) | |
It's been a quarter century: we can assume volatile is present with that name.
Diffstat (limited to 'libexec/ld.so/alpha')
| -rw-r--r-- | libexec/ld.so/alpha/archdep.h | 4 | ||||
| -rw-r--r-- | libexec/ld.so/alpha/rtld_machine.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libexec/ld.so/alpha/archdep.h b/libexec/ld.so/alpha/archdep.h index 3c77ae42cdf..37f70625bf8 100644 --- a/libexec/ld.so/alpha/archdep.h +++ b/libexec/ld.so/alpha/archdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: archdep.h,v 1.13 2010/01/02 12:16:35 kettenis Exp $ */ +/* $OpenBSD: archdep.h,v 1.14 2014/04/16 10:52:58 guenther Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -60,7 +60,7 @@ RELOC_RELA(Elf64_Rela *r, const Elf64_Sym *s, Elf64_Addr *p, unsigned long v, Elf64_Addr val = v + s->st_value + r->r_addend - (Elf64_Addr)(p); *p = val; - __asm __volatile("imb" : : : "memory"); + __asm volatile("imb" : : : "memory"); } else if (ELF64_R_TYPE(r->r_info) == RELOC_GLOB_DAT) { *p = v + s->st_value + r->r_addend; } else { diff --git a/libexec/ld.so/alpha/rtld_machine.c b/libexec/ld.so/alpha/rtld_machine.c index 14788eec751..221c9c014e1 100644 --- a/libexec/ld.so/alpha/rtld_machine.c +++ b/libexec/ld.so/alpha/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.50 2013/06/13 04:13:47 brad Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.51 2014/04/16 10:52:58 guenther Exp $ */ /* * Copyright (c) 1999 Dale Rahn @@ -185,7 +185,7 @@ resolve_failed: if (ELF_ST_BIND(sym->st_info) != STB_WEAK) fails++; } - __asm __volatile("imb" : : : "memory"); + __asm volatile("imb" : : : "memory"); /* reprotect the unprotected segments */ if ((object->dyn.textrel == 1) && (rel == DT_REL || rel == DT_RELA)) { |