Skip to content

Commit c2f86cf

Browse files
author
perry
committed
Remove leading __ from __(const|inline|signed|volatile) -- it is obsolete.
1 parent 0ed66ee commit c2f86cf

File tree

41 files changed

+121
-133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+121
-133
lines changed

‎lib/csu/common_elf/crtbegin.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: crtbegin.c,v 1.26 2004/08/28 00:19:22 thorpej Exp $ */
1+
/* $NetBSD: crtbegin.c,v 1.27 2005/12/24 21:11:15 perry Exp $ */
22

33
/*-
44
* Copyright (c) 1998, 2001, 2002 The NetBSD Foundation, Inc.
@@ -113,9 +113,9 @@ extern void __cxa_finalize(void *) __attribute__((weak));
113113
static void __attribute__((__unused__)) \
114114
__call_##func(void) \
115115
{ \
116-
__asm __volatile (".section " #section); \
116+
__asm volatile (".section " #section); \
117117
func(); \
118-
__asm __volatile (".previous"); \
118+
__asm volatile (".previous"); \
119119
}
120120
#else
121121
#error Need MD_CALL_STATIC_FUNCTION

‎lib/csu/mips/crt0.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: crt0.c,v 1.17 2004/08/26 21:13:01 thorpej Exp $ */
1+
/* $NetBSD: crt0.c,v 1.18 2005/12/24 21:11:15 perry Exp $ */
22

33
/*
44
* Copyright (c) 1995 Christopher G. Demetriou
@@ -86,7 +86,7 @@ __start(u_long sp,
8686
*/
8787

8888
#ifndef DYNAMIC
89-
__asm __volatile("la $28,_gp");
89+
__asm volatile("la $28,_gp");
9090
#endif
9191

9292
ksp = (char**)sp;
@@ -104,10 +104,10 @@ __start(u_long sp,
104104

105105
#ifndef DYNAMIC
106106
/* XXX 56 is compiler and stackframe dependent */
107-
__asm __volatile(" addiu %0,$29,56" : "=r" (ksp));
107+
__asm volatile(" addiu %0,$29,56" : "=r" (ksp));
108108
#else
109109
/* XXX 64 is compiler and stackframe dependent */
110-
__asm __volatile(" addiu %0,$29,64" : "=r" (ksp));
110+
__asm volatile(" addiu %0,$29,64" : "=r" (ksp));
111111
#endif
112112
}
113113

@@ -157,7 +157,7 @@ __start(u_long sp,
157157
* is the entrypoint. (Only needed for old toolchains).
158158
*/
159159
#if defined(LIBC_SCCS) && !defined(lint)
160-
__RCSID("$NetBSD: crt0.c,v 1.17 2004/08/26 21:13:01 thorpej Exp $");
160+
__RCSID("$NetBSD: crt0.c,v 1.18 2005/12/24 21:11:15 perry Exp $");
161161
#endif /* LIBC_SCCS and not lint */
162162

163163
#include "common.c"

‎lib/csu/sh5/dot_init.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: dot_init.h,v 1.4 2003/03/24 14:32:57 scw Exp $ */
1+
/* $NetBSD: dot_init.h,v 1.5 2005/12/24 21:11:16 perry Exp $ */
22

33
/*
44
* Copyright 2002 Wasabi Systems, Inc.
@@ -78,7 +78,7 @@
7878
#define FINI_FALLTHRU_DECL
7979

8080
#define INIT_FALLTHRU() \
81-
__asm __volatile(" addi r15, -16, r15 \n"\
81+
__asm volatile(" addi r15, -16, r15 \n"\
8282
" st.q r15, 0, r18 \n"\
8383
" gettr tr0, r18 \n"\
8484
" st.q r15, 8, r18 \n"\
@@ -92,7 +92,7 @@
9292
" ld.q r15, 0, r18 \n"\
9393
" addi r15, 16, r15")
9494
#define FINI_FALLTHRU() \
95-
__asm __volatile(" addi r15, -16, r15 \n"\
95+
__asm volatile(" addi r15, -16, r15 \n"\
9696
" st.q r15, 0, r18 \n"\
9797
" gettr tr0, r18 \n"\
9898
" st.q r15, 8, r18 \n"\

‎lib/libarch/alpha/alpha_pci_io.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: alpha_pci_io.c,v 1.2 2001/07/17 17:46:42 thorpej Exp $ */
1+
/* $NetBSD: alpha_pci_io.c,v 1.3 2005/12/24 21:11:16 perry Exp $ */
22

33
/*-
44
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -129,7 +129,7 @@ alpha_pci_io_enable(int onoff)
129129
return (0);
130130
}
131131

132-
static __inline struct alpha_bus_window *
132+
static inline struct alpha_bus_window *
133133
alpha_pci_io_findwindow(bus_addr_t ioaddr)
134134
{
135135
struct alpha_bus_window *abw;
@@ -150,7 +150,7 @@ alpha_pci_io_findwindow(bus_addr_t ioaddr)
150150
/* NOTREACHED */
151151
}
152152

153-
static __inline uint32_t *
153+
static inline uint32_t *
154154
alpha_pci_io_swiz(bus_addr_t ioaddr, int size)
155155
{
156156
struct alpha_bus_window *abw = alpha_pci_io_findwindow(ioaddr);

‎lib/libc/arch/arm/softfloat/arm-gcc.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: arm-gcc.h,v 1.2 2001/02/21 18:09:25 bjh21 Exp $ */
1+
/* $NetBSD: arm-gcc.h,v 1.3 2005/12/24 21:11:16 perry Exp $ */
22

33
/*
44
-------------------------------------------------------------------------------
@@ -81,7 +81,7 @@ a compiler does not support explicit inlining, this macro should be defined
8181
to be `static'.
8282
-------------------------------------------------------------------------------
8383
*/
84-
#define INLINE static __inline
84+
#define INLINE static inline
8585

8686
/*
8787
-------------------------------------------------------------------------------

‎lib/libc/arch/m68k/softfloat/m68k-gcc.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: m68k-gcc.h,v 1.1 2004/09/26 21:13:27 jmmv Exp $ */
1+
/* $NetBSD: m68k-gcc.h,v 1.2 2005/12/24 21:11:16 perry Exp $ */
22

33
/*
44
-------------------------------------------------------------------------------
@@ -83,7 +83,7 @@ a compiler does not support explicit inlining, this macro should be defined
8383
to be `static'.
8484
-------------------------------------------------------------------------------
8585
*/
86-
#define INLINE static __inline
86+
#define INLINE static inline
8787

8888
#define FLOAT64_DEMANGLE(a) (a)
8989
#define FLOAT64_MANGLE(a) (a)

‎lib/libc/arch/powerpc/gen/fabs.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: fabs.c,v 1.2 2001/05/25 12:28:12 tsubai Exp $ */
1+
/* $NetBSD: fabs.c,v 1.3 2005/12/24 21:11:16 perry Exp $ */
22

33
#include <math.h>
44

@@ -9,7 +9,7 @@ fabs(double x)
99
if (x < 0)
1010
x = -x;
1111
#else
12-
__asm__ __volatile("fabs %0,%1" : "=f"(x) : "f"(x));
12+
__asm__ volatile("fabs %0,%1" : "=f"(x) : "f"(x));
1313
#endif
1414
return (x);
1515
}

‎lib/libc/arch/powerpc/gen/flt_rounds.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: flt_rounds.c,v 1.8 2005/06/12 05:21:26 lukem Exp $ */
1+
/* $NetBSD: flt_rounds.c,v 1.9 2005/12/24 21:11:16 perry Exp $ */
22

33
/*
44
* Copyright (c) 1996 Mark Brinicombe
@@ -33,7 +33,7 @@
3333

3434
#include <sys/cdefs.h>
3535
#if defined(LIBC_SCCS) && !defined(lint)
36-
__RCSID("$NetBSD: flt_rounds.c,v 1.8 2005/06/12 05:21:26 lukem Exp $");
36+
__RCSID("$NetBSD: flt_rounds.c,v 1.9 2005/12/24 21:11:16 perry Exp $");
3737
#endif /* LIBC_SCCS and not lint */
3838

3939
#include <ieeefp.h>
@@ -56,7 +56,7 @@ __flt_rounds(void)
5656
#else
5757
uint64_t fpscr;
5858

59-
__asm__ __volatile("mffs %0" : "=f"(fpscr));
59+
__asm__ volatile("mffs %0" : "=f"(fpscr));
6060
return map[((uint32_t)fpscr & FPSCR_RN)];
6161
#endif
6262
}

‎lib/libc/arch/powerpc/gen/fpgetmask.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: fpgetmask.c,v 1.6 2005/06/12 05:21:26 lukem Exp $ */
1+
/* $NetBSD: fpgetmask.c,v 1.7 2005/12/24 21:11:16 perry Exp $ */
22

33
/*
44
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
3838

3939
#include <sys/cdefs.h>
4040
#if defined(LIBC_SCCS) && !defined(lint)
41-
__RCSID("$NetBSD: fpgetmask.c,v 1.6 2005/06/12 05:21:26 lukem Exp $");
41+
__RCSID("$NetBSD: fpgetmask.c,v 1.7 2005/12/24 21:11:16 perry Exp $");
4242
#endif /* LIBC_SCCS and not lint */
4343

4444
#include "namespace.h"
@@ -59,6 +59,6 @@ fpgetmask(void)
5959
{
6060
uint64_t fpscr;
6161

62-
__asm__ __volatile("mffs %0" : "=f"(fpscr));
62+
__asm__ volatile("mffs %0" : "=f"(fpscr));
6363
return (((uint32_t)fpscr & MASKBITS) >> MASKSHFT);
6464
}

‎lib/libc/arch/powerpc/gen/fpgetround.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: fpgetround.c,v 1.6 2005/06/12 05:21:26 lukem Exp $ */
1+
/* $NetBSD: fpgetround.c,v 1.7 2005/12/24 21:11:16 perry Exp $ */
22

33
/*
44
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
3838

3939
#include <sys/cdefs.h>
4040
#if defined(LIBC_SCCS) && !defined(lint)
41-
__RCSID("$NetBSD: fpgetround.c,v 1.6 2005/06/12 05:21:26 lukem Exp $");
41+
__RCSID("$NetBSD: fpgetround.c,v 1.7 2005/12/24 21:11:16 perry Exp $");
4242
#endif /* LIBC_SCCS and not lint */
4343

4444
#include "namespace.h"
@@ -59,6 +59,6 @@ fpgetround(void)
5959
{
6060
uint64_t fpscr;
6161

62-
__asm__ __volatile("mffs %0" : "=f"(fpscr));
62+
__asm__ volatile("mffs %0" : "=f"(fpscr));
6363
return (((uint32_t)fpscr & ROUNDBITS) >> ROUNDSHFT);
6464
}

0 commit comments

Comments
 (0)