Module Name: src
Committed By: joerg
Date: Sun Aug 23 10:59:15 UTC 2015
Modified Files:
src/sys/arch/sparc/include: asm.h
src/sys/arch/sparc/stand/ofwboot: srt0.s
src/sys/arch/sparc64/include: locore.h
Log Message:
Remove .proc 1, it has been ignored by gas for ages.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sparc/include/asm.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sparc/stand/ofwboot/srt0.s
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc64/include/locore.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/include/asm.h
diff -u src/sys/arch/sparc/include/asm.h:1.20 src/sys/arch/sparc/include/asm.h:1.21
--- src/sys/arch/sparc/include/asm.h:1.20 Sat Apr 12 21:26:45 2014
+++ src/sys/arch/sparc/include/asm.h Sun Aug 23 10:59:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: asm.h,v 1.20 2014/04/12 21:26:45 joerg Exp $ */
+/* $NetBSD: asm.h,v 1.21 2015/08/23 10:59:15 joerg Exp $ */
/*
* Copyright (c) 1994 Allen Briggs
@@ -113,7 +113,7 @@
#define OTYPE(x) .type x,@object
#define _ENTRY(name) \
- .align 4; .globl name; .proc 1; FTYPE(name); name:
+ .align 4; .globl name; FTYPE(name); name:
#ifdef GPROF
/* see _MCOUNT_ENTRY in profile.h */
Index: src/sys/arch/sparc/stand/ofwboot/srt0.s
diff -u src/sys/arch/sparc/stand/ofwboot/srt0.s:1.6 src/sys/arch/sparc/stand/ofwboot/srt0.s:1.7
--- src/sys/arch/sparc/stand/ofwboot/srt0.s:1.6 Wed Oct 17 19:57:16 2007
+++ src/sys/arch/sparc/stand/ofwboot/srt0.s Sun Aug 23 10:59:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: srt0.s,v 1.6 2007/10/17 19:57:16 garbled Exp $ */
+/* $NetBSD: srt0.s,v 1.7 2015/08/23 10:59:15 joerg Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -136,7 +136,6 @@ _C_LABEL(syncicache):
*/
.align 8
.globl _C_LABEL(openfirmware)
- .proc 1
FTYPE(openfirmware)
_C_LABEL(openfirmware):
andcc %sp, 1, %g0
Index: src/sys/arch/sparc64/include/locore.h
diff -u src/sys/arch/sparc64/include/locore.h:1.7 src/sys/arch/sparc64/include/locore.h:1.8
--- src/sys/arch/sparc64/include/locore.h:1.7 Sun Aug 23 10:53:28 2015
+++ src/sys/arch/sparc64/include/locore.h Sun Aug 23 10:59:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.7 2015/08/23 10:53:28 joerg Exp $ */
+/* $NetBSD: locore.h,v 1.8 2015/08/23 10:59:15 joerg Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath
@@ -167,7 +167,7 @@
#ifdef GPROF
.globl _mcount
#define ENTRY(x) \
- .globl _C_LABEL(x); .proc 1; .type _C_LABEL(x),@function; \
+ .globl _C_LABEL(x); .type _C_LABEL(x),@function; \
_C_LABEL(x): ; \
.data; \
.align 8; \
@@ -179,8 +179,8 @@ _C_LABEL(x): ; \
or %o0, %lo(0b), %o0; \
restore
#else
-#define ENTRY(x) .globl _C_LABEL(x); .proc 1; \
- .type _C_LABEL(x),@function; _C_LABEL(x):
+#define ENTRY(x) .globl _C_LABEL(x); .type _C_LABEL(x),@function; \
+ _C_LABEL(x):
#endif
#define ALTENTRY(x) .globl _C_LABEL(x); _C_LABEL(x):
