diff options
| author | perry <perry@NetBSD.org> | 2005-12-24 20:56:41 +0000 |
|---|---|---|
| committer | perry <perry@NetBSD.org> | 2005-12-24 20:56:41 +0000 |
| commit | ae6ae2c3629901f9cf77d98ed41e207fd36bd50d (patch) | |
| tree | ffa0171548864e330fc466d98545bfca14192fc3 /libexec | |
| parent | 0f0296d88a3d2cc897af15d9f1a531111b5e3d1b (diff) | |
Remove leading __ from __(const|inline|signed|volatile) -- it is obsolete.
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ld.aout_so/arch/arm32/md.c | 8 | ||||
| -rw-r--r-- | libexec/ld.aout_so/arch/sparc/md.c | 10 | ||||
| -rw-r--r-- | libexec/ld.elf_so/arch/alpha/alpha_reloc.c | 12 | ||||
| -rw-r--r-- | libexec/ld.elf_so/arch/arm/mdreloc.c | 8 | ||||
| -rw-r--r-- | libexec/ld.elf_so/arch/mips/mips_reloc.c | 8 | ||||
| -rw-r--r-- | libexec/ld.elf_so/arch/sh5/mdreloc.c | 8 | ||||
| -rw-r--r-- | libexec/ld.elf_so/arch/sparc/mdreloc.c | 8 | ||||
| -rw-r--r-- | libexec/ld.elf_so/arch/sparc64/mdreloc.c | 50 |
8 files changed, 56 insertions, 56 deletions
diff --git a/libexec/ld.aout_so/arch/arm32/md.c b/libexec/ld.aout_so/arch/arm32/md.c index b2a7af12204..ca90457a4b6 100644 --- a/libexec/ld.aout_so/arch/arm32/md.c +++ b/libexec/ld.aout_so/arch/arm32/md.c @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.11 1999/02/27 03:34:05 tv Exp $ */ +/* $NetBSD: md.c,v 1.12 2005/12/24 20:59:30 perry Exp $ */ /* * Copyright (C) 1997 Mark Brinicombe @@ -56,14 +56,14 @@ #endif #ifdef RTLD -__inline void iflush __P((void *addr, int len)); +inline void iflush __P((void *addr, int len)); /* * Flush the instruction cache of the specified address * Some processors have separate instruction caches and * as such may need a flush following a jump slot fixup. */ -__inline void +inline void iflush(addr, len) void *addr; int len; @@ -78,7 +78,7 @@ iflush(addr, len) p.addr = (u_int)addr; p.len = len; - __asm __volatile("mov r0, %0; mov r1, %1; swi %2" + __asm volatile("mov r0, %0; mov r1, %1; swi %2" : : "I" (ARM32_SYNC_ICACHE), "r" (&p), "J" (SYS_sysarch)); } #endif /* RTLD */ diff --git a/libexec/ld.aout_so/arch/sparc/md.c b/libexec/ld.aout_so/arch/sparc/md.c index e32ed2b99e7..37b88ad8040 100644 --- a/libexec/ld.aout_so/arch/sparc/md.c +++ b/libexec/ld.aout_so/arch/sparc/md.c @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.19 1998/12/17 14:29:50 pk Exp $ */ +/* $NetBSD: md.c,v 1.20 2005/12/24 20:59:30 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -100,13 +100,13 @@ static int reloc_target_bitsize[] = { static void iflush __P((jmpslot_t *)); -static __inline void +static inline void iflush(sp) jmpslot_t *sp; { - __asm __volatile("iflush %0+0" : : "r" (sp)); - __asm __volatile("iflush %0+4" : : "r" (sp)); - __asm __volatile("iflush %0+8" : : "r" (sp)); + __asm volatile("iflush %0+0" : : "r" (sp)); + __asm volatile("iflush %0+4" : : "r" (sp)); + __asm volatile("iflush %0+8" : : "r" (sp)); } /* diff --git a/libexec/ld.elf_so/arch/alpha/alpha_reloc.c b/libexec/ld.elf_so/arch/alpha/alpha_reloc.c index f1fc418f274..3b29105bcc8 100644 --- a/libexec/ld.elf_so/arch/alpha/alpha_reloc.c +++ b/libexec/ld.elf_so/arch/alpha/alpha_reloc.c @@ -1,4 +1,4 @@ -/* $NetBSD: alpha_reloc.c,v 1.28 2005/08/20 19:01:16 skrll Exp $ */ +/* $NetBSD: alpha_reloc.c,v 1.29 2005/12/24 20:59:30 perry Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -62,7 +62,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: alpha_reloc.c,v 1.28 2005/08/20 19:01:16 skrll Exp $"); +__RCSID("$NetBSD: alpha_reloc.c,v 1.29 2005/12/24 20:59:30 perry Exp $"); #endif /* not lint */ #include <sys/types.h> @@ -143,7 +143,7 @@ _rtld_setup_pltgot(const Obj_Entry *obj) obj->pltgot[3] = (Elf_Addr) obj; } - __asm __volatile("imb"); + __asm volatile("imb"); } /* @@ -153,7 +153,7 @@ _rtld_setup_pltgot(const Obj_Entry *obj) #define RELOC_ALIGNED_P(x) \ (((uintptr_t)(x) & (sizeof(void *) - 1)) == 0) -static __inline Elf_Addr +static inline Elf_Addr load_ptr(void *where) { Elf_Addr res; @@ -163,7 +163,7 @@ load_ptr(void *where) return (res); } -static __inline void +static inline void store_ptr(void *where, Elf_Addr val) { @@ -469,7 +469,7 @@ _rtld_relocate_plt_object(const Obj_Entry *obj, const Elf_Rela *rela, Elf_Addr * * Commit the tail of the insn sequence to memory * before overwriting the first insn. */ - __asm __volatile("wmb" ::: "memory"); + __asm volatile("wmb" ::: "memory"); stubptr[0] = insn[0]; /* * I-stream will be sync'd when we either return from diff --git a/libexec/ld.elf_so/arch/arm/mdreloc.c b/libexec/ld.elf_so/arch/arm/mdreloc.c index 1d9d691f6ab..f6e03b62ffb 100644 --- a/libexec/ld.elf_so/arch/arm/mdreloc.c +++ b/libexec/ld.elf_so/arch/arm/mdreloc.c @@ -1,8 +1,8 @@ -/* $NetBSD: mdreloc.c,v 1.26 2005/08/20 19:01:16 skrll Exp $ */ +/* $NetBSD: mdreloc.c,v 1.27 2005/12/24 20:59:30 perry Exp $ */ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: mdreloc.c,v 1.26 2005/08/20 19:01:16 skrll Exp $"); +__RCSID("$NetBSD: mdreloc.c,v 1.27 2005/12/24 20:59:30 perry Exp $"); #endif /* not lint */ #include <sys/types.h> @@ -55,7 +55,7 @@ _rtld_relocate_nonplt_self(Elf_Dyn *dynp, Elf_Addr relocbase) #define RELOC_ALIGNED_P(x) \ (((uintptr_t)(x) & (sizeof(void *) - 1)) == 0) -static __inline Elf_Addr +static inline Elf_Addr load_ptr(void *where) { Elf_Addr res; @@ -65,7 +65,7 @@ load_ptr(void *where) return (res); } -static __inline void +static inline void store_ptr(void *where, Elf_Addr val) { diff --git a/libexec/ld.elf_so/arch/mips/mips_reloc.c b/libexec/ld.elf_so/arch/mips/mips_reloc.c index cdba8d6f223..cdd5b0a7e07 100644 --- a/libexec/ld.elf_so/arch/mips/mips_reloc.c +++ b/libexec/ld.elf_so/arch/mips/mips_reloc.c @@ -1,4 +1,4 @@ -/* $NetBSD: mips_reloc.c,v 1.48 2005/08/20 19:01:17 skrll Exp $ */ +/* $NetBSD: mips_reloc.c,v 1.49 2005/12/24 20:59:30 perry Exp $ */ /* * Copyright 1997 Michael L. Hitch <mhitch@montana.edu> @@ -30,7 +30,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: mips_reloc.c,v 1.48 2005/08/20 19:01:17 skrll Exp $"); +__RCSID("$NetBSD: mips_reloc.c,v 1.49 2005/12/24 20:59:30 perry Exp $"); #endif /* not lint */ #include <sys/types.h> @@ -55,7 +55,7 @@ caddr_t _rtld_bind(Elf_Word, Elf_Addr, Elf_Addr, Elf_Addr); #define RELOC_ALIGNED_P(x) \ (((uintptr_t)(x) & (sizeof(void *) - 1)) == 0) -static __inline Elf_Addr +static inline Elf_Addr load_ptr(void *where) { Elf_Addr res; @@ -65,7 +65,7 @@ load_ptr(void *where) return res; } -static __inline void +static inline void store_ptr(void *where, Elf_Addr val) { diff --git a/libexec/ld.elf_so/arch/sh5/mdreloc.c b/libexec/ld.elf_so/arch/sh5/mdreloc.c index 1b2306e2468..99bdfba0271 100644 --- a/libexec/ld.elf_so/arch/sh5/mdreloc.c +++ b/libexec/ld.elf_so/arch/sh5/mdreloc.c @@ -1,8 +1,8 @@ -/* $NetBSD: mdreloc.c,v 1.5 2005/08/20 19:01:17 skrll Exp $ */ +/* $NetBSD: mdreloc.c,v 1.6 2005/12/24 20:59:30 perry Exp $ */ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: mdreloc.c,v 1.5 2005/08/20 19:01:17 skrll Exp $"); +__RCSID("$NetBSD: mdreloc.c,v 1.6 2005/12/24 20:59:30 perry Exp $"); #endif /* not lint */ #include <sys/types.h> @@ -61,7 +61,7 @@ _rtld_relocate_nonplt_self(Elf_Dyn *dynp, Elf_Addr relocbase) #define RELOC_ALIGNED_P(x) \ (((intptr_t)(x) & (sizeof(void *) - 1)) == 0) -static __inline Elf_Addr +static inline Elf_Addr load_ptr(void *where) { Elf_Addr res; @@ -71,7 +71,7 @@ load_ptr(void *where) return (res); } -static __inline void +static inline void store_ptr(void *where, Elf_Addr val) { diff --git a/libexec/ld.elf_so/arch/sparc/mdreloc.c b/libexec/ld.elf_so/arch/sparc/mdreloc.c index 062cf776449..8453a5738e4 100644 --- a/libexec/ld.elf_so/arch/sparc/mdreloc.c +++ b/libexec/ld.elf_so/arch/sparc/mdreloc.c @@ -1,4 +1,4 @@ -/* $NetBSD: mdreloc.c,v 1.37 2005/08/20 19:01:17 skrll Exp $ */ +/* $NetBSD: mdreloc.c,v 1.38 2005/12/24 20:59:31 perry Exp $ */ /*- * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: mdreloc.c,v 1.37 2005/08/20 19:01:17 skrll Exp $"); +__RCSID("$NetBSD: mdreloc.c,v 1.38 2005/12/24 20:59:31 perry Exp $"); #endif /* not lint */ #include <errno.h> @@ -389,8 +389,8 @@ _rtld_relocate_plt_object(const Obj_Entry *obj, const Elf_Rela *rela, Elf_Addr * #define NOP 0x01000000 where[2] = JMP | (value & 0x000003ff); where[1] = SETHI | ((value >> 10) & 0x003fffff); - __asm __volatile("iflush %0+8" : : "r" (where)); - __asm __volatile("iflush %0+4" : : "r" (where)); + __asm volatile("iflush %0+8" : : "r" (where)); + __asm volatile("iflush %0+4" : : "r" (where)); if (tp) *tp = value; diff --git a/libexec/ld.elf_so/arch/sparc64/mdreloc.c b/libexec/ld.elf_so/arch/sparc64/mdreloc.c index 84168b2d64e..58fabb8080e 100644 --- a/libexec/ld.elf_so/arch/sparc64/mdreloc.c +++ b/libexec/ld.elf_so/arch/sparc64/mdreloc.c @@ -1,4 +1,4 @@ -/* $NetBSD: mdreloc.c,v 1.37 2005/08/20 19:01:17 skrll Exp $ */ +/* $NetBSD: mdreloc.c,v 1.38 2005/12/24 20:59:31 perry Exp $ */ /*- * Copyright (c) 2000 Eduardo Horvath. @@ -39,7 +39,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: mdreloc.c,v 1.37 2005/08/20 19:01:17 skrll Exp $"); +__RCSID("$NetBSD: mdreloc.c,v 1.38 2005/12/24 20:59:31 perry Exp $"); #endif /* not lint */ #include <errno.h> @@ -581,7 +581,7 @@ _rtld_relocate_plt_object(const Obj_Entry *obj, const Elf_Rela *rela, Elf_Addr * * */ where[1] = BAA | ((offset >> 2) &0x3fffff); - __asm __volatile("iflush %0+4" : : "r" (where)); + __asm volatile("iflush %0+4" : : "r" (where)); } else if (value >= 0 && value < (1L<<32)) { /* * We're within 32-bits of address zero. @@ -600,8 +600,8 @@ _rtld_relocate_plt_object(const Obj_Entry *obj, const Elf_Rela *rela, Elf_Addr * */ where[2] = JMP | LOVAL(value, 0); where[1] = SETHI | HIVAL(value, 10); - __asm __volatile("iflush %0+8" : : "r" (where)); - __asm __volatile("iflush %0+4" : : "r" (where)); + __asm volatile("iflush %0+8" : : "r" (where)); + __asm volatile("iflush %0+4" : : "r" (where)); } else if (value <= 0 && value > -(1L<<32)) { /* @@ -622,9 +622,9 @@ _rtld_relocate_plt_object(const Obj_Entry *obj, const Elf_Rela *rela, Elf_Addr * where[3] = JMP; where[2] = XOR | ((~value) & 0x00001fff); where[1] = SETHI | HIVAL(~value, 10); - __asm __volatile("iflush %0+12" : : "r" (where)); - __asm __volatile("iflush %0+8" : : "r" (where)); - __asm __volatile("iflush %0+4" : : "r" (where)); + __asm volatile("iflush %0+12" : : "r" (where)); + __asm volatile("iflush %0+8" : : "r" (where)); + __asm volatile("iflush %0+4" : : "r" (where)); } else if (offset <= (1L<<32) && offset >= -((1L<<32) - 4)) { /* @@ -645,9 +645,9 @@ _rtld_relocate_plt_object(const Obj_Entry *obj, const Elf_Rela *rela, Elf_Addr * where[3] = MOV17; where[2] = CALL | ((offset >> 4) & 0x3fffffff); where[1] = MOV71; - __asm __volatile("iflush %0+12" : : "r" (where)); - __asm __volatile("iflush %0+8" : : "r" (where)); - __asm __volatile("iflush %0+4" : : "r" (where)); + __asm volatile("iflush %0+12" : : "r" (where)); + __asm volatile("iflush %0+8" : : "r" (where)); + __asm volatile("iflush %0+4" : : "r" (where)); } else if (offset >= 0 && offset < (1L<<44)) { /* @@ -669,10 +669,10 @@ _rtld_relocate_plt_object(const Obj_Entry *obj, const Elf_Rela *rela, Elf_Addr * where[3] = SLLX | 12; where[2] = OR | (((offset) >> 12) & 0x00001fff); where[1] = SETHI | HIVAL(offset, 22); - __asm __volatile("iflush %0+16" : : "r" (where)); - __asm __volatile("iflush %0+12" : : "r" (where)); - __asm __volatile("iflush %0+8" : : "r" (where)); - __asm __volatile("iflush %0+4" : : "r" (where)); + __asm volatile("iflush %0+16" : : "r" (where)); + __asm volatile("iflush %0+12" : : "r" (where)); + __asm volatile("iflush %0+8" : : "r" (where)); + __asm volatile("iflush %0+4" : : "r" (where)); } else if (offset < 0 && offset > -(1L<<44)) { /* @@ -694,10 +694,10 @@ _rtld_relocate_plt_object(const Obj_Entry *obj, const Elf_Rela *rela, Elf_Addr * where[3] = SLLX | 12; where[2] = XOR | (((~offset) >> 12) & 0x00001fff); where[1] = SETHI | HIVAL(~offset, 22); - __asm __volatile("iflush %0+16" : : "r" (where)); - __asm __volatile("iflush %0+12" : : "r" (where)); - __asm __volatile("iflush %0+8" : : "r" (where)); - __asm __volatile("iflush %0+4" : : "r" (where)); + __asm volatile("iflush %0+16" : : "r" (where)); + __asm volatile("iflush %0+12" : : "r" (where)); + __asm volatile("iflush %0+8" : : "r" (where)); + __asm volatile("iflush %0+4" : : "r" (where)); } else { /* @@ -721,12 +721,12 @@ _rtld_relocate_plt_object(const Obj_Entry *obj, const Elf_Rela *rela, Elf_Addr * where[3] = OR | LOVAL(value, 32); where[2] = SETHIG5 | HIVAL(value, 10); where[1] = SETHI | HIVAL(value, 42); - __asm __volatile("iflush %0+24" : : "r" (where)); - __asm __volatile("iflush %0+20" : : "r" (where)); - __asm __volatile("iflush %0+16" : : "r" (where)); - __asm __volatile("iflush %0+12" : : "r" (where)); - __asm __volatile("iflush %0+8" : : "r" (where)); - __asm __volatile("iflush %0+4" : : "r" (where)); + __asm volatile("iflush %0+24" : : "r" (where)); + __asm volatile("iflush %0+20" : : "r" (where)); + __asm volatile("iflush %0+16" : : "r" (where)); + __asm volatile("iflush %0+12" : : "r" (where)); + __asm volatile("iflush %0+8" : : "r" (where)); + __asm volatile("iflush %0+4" : : "r" (where)); } |
