Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove leading __ from __(const|inline|signed|volatile) -- it is obsolete.

This commit is contained in:
perry 2005-12-24 20:56:41 +00:00
parent 0f0296d88a
commit ae6ae2c362
12 changed files with 83 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libexec/ld.aout_so/arch/arm32/md.c
View File

@ -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 */

10
libexec/ld.aout_so/arch/sparc/md.c
View File

@ -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));
}
/*

12
libexec/ld.elf_so/arch/alpha/alpha_reloc.c
View File

@ -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

8
libexec/ld.elf_so/arch/arm/mdreloc.c
View File

@ -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)
{

8
libexec/ld.elf_so/arch/mips/mips_reloc.c
View File

@ -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)
{

8
libexec/ld.elf_so/arch/sh5/mdreloc.c
View File

@ -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)
{

8
libexec/ld.elf_so/arch/sparc/mdreloc.c
View File

@ -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;

50
libexec/ld.elf_so/arch/sparc64/mdreloc.c
View File

@ -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));
}

6
usr.sbin/makefs/cd9660/cd9660_conversion.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_conversion.c,v 1.2 2005/10/30 03:10:28 dyoung Exp $ */
/* $NetBSD: cd9660_conversion.c,v 1.3 2005/12/24 20:56:41 perry Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@ -35,14 +35,14 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
__RCSID("$NetBSD: cd9660_conversion.c,v 1.2 2005/10/30 03:10:28 dyoung Exp $");
__RCSID("$NetBSD: cd9660_conversion.c,v 1.3 2005/12/24 20:56:41 perry Exp $");
#endif /* !__lint */
static char cd9660_compute_gm_offset(time_t);
#if 0
static __inline int
static inline int
cd9660_pad_even(length)
int length;
{

6
usr.sbin/makefs/cd9660/cd9660_debug.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_debug.c,v 1.3 2005/10/30 03:10:28 dyoung Exp $ */
/* $NetBSD: cd9660_debug.c,v 1.4 2005/12/24 20:56:41 perry Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@ -40,7 +40,7 @@
#include <sys/param.h>
#if defined(__RCSID) && !defined(__lint)
__RCSID("$NetBSD: cd9660_debug.c,v 1.3 2005/10/30 03:10:28 dyoung Exp $");
__RCSID("$NetBSD: cd9660_debug.c,v 1.4 2005/12/24 20:56:41 perry Exp $");
#endif /* !__lint */
#if !HAVE_NBTOOL_CONFIG_H
@ -55,7 +55,7 @@ static void debug_print_susp_attrs(cd9660node *, int);
static void debug_dump_to_xml_padded_hex_output(const char *, unsigned char *,
int);
static __inline void
static inline void
print_n_tabs(int n)
{
int i;

8
usr.sbin/makefs/cd9660/cd9660_strings.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_strings.c,v 1.2 2005/10/30 03:10:28 dyoung Exp $ */
/* $NetBSD: cd9660_strings.c,v 1.3 2005/12/24 20:56:41 perry Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@ -49,7 +49,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
__RCSID("$NetBSD: cd9660_strings.c,v 1.2 2005/10/30 03:10:28 dyoung Exp $");
__RCSID("$NetBSD: cd9660_strings.c,v 1.3 2005/12/24 20:56:41 perry Exp $");
#endif /* !__lint */
@ -64,7 +64,7 @@ cd9660_uppercase_characters(char *str, int len)
}
}
static __inline int
static inline int
cd9660_is_a_char(char c)
{
return (isupper((unsigned char)c)
@ -72,7 +72,7 @@ cd9660_is_a_char(char c)
|| (c >= '0' && c <= '?'));
}
static __inline int
static inline int
cd9660_is_d_char(char c)
{
return (isupper((unsigned char)c)

34
usr.sbin/makefs/cd9660/iso.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: iso.h,v 1.1 2005/08/13 01:53:01 fvdl Exp $ */
/* $NetBSD: iso.h,v 1.2 2005/12/24 20:56:41 perry Exp $ */
/*-
* Copyright (c) 1994
@ -168,17 +168,17 @@ struct iso_extended_attributes {
u_char len_au [ISODCL (247, 250)]; /* 723 */
};
static __inline int isonum_711 __P((u_char *)) __attribute__ ((unused));
static __inline int isonum_712 __P((signed char *)) __attribute__ ((unused));
static __inline uint16_t isonum_721 __P((u_char *)) __attribute__ ((unused));
static __inline uint16_t isonum_722 __P((u_char *)) __attribute__ ((unused));
static __inline uint16_t isonum_723 __P((u_char *)) __attribute__ ((unused));
static __inline uint32_t isonum_731 __P((u_char *)) __attribute__ ((unused));
static __inline uint32_t isonum_732 __P((u_char *)) __attribute__ ((unused));
static __inline uint32_t isonum_733 __P((u_char *)) __attribute__ ((unused));
static inline int isonum_711 __P((u_char *)) __attribute__ ((unused));
static inline int isonum_712 __P((signed char *)) __attribute__ ((unused));
static inline uint16_t isonum_721 __P((u_char *)) __attribute__ ((unused));
static inline uint16_t isonum_722 __P((u_char *)) __attribute__ ((unused));
static inline uint16_t isonum_723 __P((u_char *)) __attribute__ ((unused));
static inline uint32_t isonum_731 __P((u_char *)) __attribute__ ((unused));
static inline uint32_t isonum_732 __P((u_char *)) __attribute__ ((unused));
static inline uint32_t isonum_733 __P((u_char *)) __attribute__ ((unused));
/* 7.1.1: unsigned char */
static __inline int
static inline int
#if __STDC__
isonum_711(u_char *p)
#else
@ -190,7 +190,7 @@ isonum_711(p)
}
/* 7.1.2: signed(?) char */
static __inline int
static inline int
#if __STDC__
isonum_712(signed char *p)
#else
@ -202,7 +202,7 @@ isonum_712(p)
}
/* 7.2.1: unsigned little-endian 16-bit value. NOT USED IN KERNEL. */
static __inline uint16_t
static inline uint16_t
isonum_721(p)
u_char *p;
{
@ -214,7 +214,7 @@ isonum_721(p)
}
/* 7.2.2: unsigned big-endian 16-bit value. NOT USED IN KERNEL. */
static __inline uint16_t
static inline uint16_t
isonum_722(p)
unsigned char *p;
{
@ -226,7 +226,7 @@ isonum_722(p)
}
/* 7.2.3: unsigned both-endian (little, then big) 16-bit value */
static __inline uint16_t
static inline uint16_t
#if __STDC__
isonum_723(u_char *p)
#else
@ -247,7 +247,7 @@ isonum_723(p)
}
/* 7.3.1: unsigned little-endian 32-bit value. NOT USED IN KERNEL. */
static __inline uint32_t
static inline uint32_t
isonum_731(p)
u_char *p;
{
@ -259,7 +259,7 @@ isonum_731(p)
}
/* 7.3.2: unsigned big-endian 32-bit value. NOT USED IN KERNEL. */
static __inline uint32_t
static inline uint32_t
isonum_732(p)
unsigned char *p;
{
@ -271,7 +271,7 @@ isonum_732(p)
}
/* 7.3.3: unsigned both-endian (little, then big) 32-bit value */
static __inline uint32_t
static inline uint32_t
#if __STDC__
isonum_733(u_char *p)
#else