Cumulative gcc 3.3 patch

Craig Dooley craig at xlnx-x.net
Wed Nov 12 13:50:55 PST 2003


Heres the patch that allows a full buildkernel with gcc 3.3.2 from ports.
Module loading works at least for linux and linprocfs.  I have not tried 
dumping a kernel core and using gdb, but it compiles and runs.
-- 
------------------------------------------------------------------------
Craig Dooley						craig at xxxxxxxxxx
------------------------------------------------------------------------
Index: sys/crypto/des/arch/i386/des_enc.S
===================================================================
RCS file: /home/dcvs/src/sys/crypto/des/arch/i386/des_enc.S,v
retrieving revision 1.2
diff -u -r1.2 des_enc.S
--- sys/crypto/des/arch/i386/des_enc.S	17 Jun 2003 04:28:20 -0000	1.2
+++ sys/crypto/des/arch/i386/des_enc.S	12 Nov 2003 21:20:07 -0000
@@ -71,7 +71,7 @@
 	pushl	%esi
 	pushl	%edi
 
-	# Load the 2 words 
+	/* Load the 2 words */
 	movl	12(%esp),	%esi
 	xorl	%ecx,		%ecx
 	pushl	%ebx
@@ -80,7 +80,7 @@
 	movl	28(%esp),	%ebx
 	movl	4(%esi),	%edi
 
-	# IP 
+	/* IP */
 	roll	$4,		%eax
 	movl	%eax,		%esi
 	xorl	%edi,		%eax
@@ -122,7 +122,7 @@
 	cmpl	$0,		%ebx
 	je	.L000start_decrypt
 
-	# Round 0 
+	/* Round 0 */
 	movl	(%ebp),		%eax
 	xorl	%ebx,		%ebx
 	movl	4(%ebp),	%edx
@@ -159,7 +159,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 1 
+	/* Round 1 */
 	movl	8(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	12(%ebp),	%edx
@@ -196,7 +196,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 2 
+	/* Round 2 */
 	movl	16(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	20(%ebp),	%edx
@@ -233,7 +233,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 3 
+	/* Round 3 */
 	movl	24(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	28(%ebp),	%edx
@@ -270,7 +270,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 4 
+	/* Round 4 */
 	movl	32(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	36(%ebp),	%edx
@@ -307,7 +307,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 5 
+	/* Round 5 */
 	movl	40(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	44(%ebp),	%edx
@@ -344,7 +344,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 6 
+	/* Round 6 */
 	movl	48(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	52(%ebp),	%edx
@@ -381,7 +381,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 7 
+	/* Round 7 */
 	movl	56(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	60(%ebp),	%edx
@@ -418,7 +418,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 8 
+	/* Round 8 */
 	movl	64(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	68(%ebp),	%edx
@@ -455,7 +455,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 9 
+	/* Round 9 */
 	movl	72(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	76(%ebp),	%edx
@@ -492,7 +492,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 10 
+	/* Round 10 */
 	movl	80(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	84(%ebp),	%edx
@@ -529,7 +529,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 11 
+	/* Round 11 */
 	movl	88(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	92(%ebp),	%edx
@@ -566,7 +566,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 12 
+	/* Round 12 */
 	movl	96(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	100(%ebp),	%edx
@@ -603,7 +603,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 13 
+	/* Round 13 */
 	movl	104(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	108(%ebp),	%edx
@@ -640,7 +640,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 14 
+	/* Round 14 */
 	movl	112(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	116(%ebp),	%edx
@@ -677,7 +677,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 15 
+	/* Round 15 */
 	movl	120(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	124(%ebp),	%edx
@@ -716,7 +716,7 @@
 	jmp	.L001end
 .L000start_decrypt:
 
-	# Round 15 
+	/* Round 15 */
 	movl	120(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	124(%ebp),	%edx
@@ -753,7 +753,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 14 
+	/* Round 14 */
 	movl	112(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	116(%ebp),	%edx
@@ -790,7 +790,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 13 
+	/* Round 13 */
 	movl	104(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	108(%ebp),	%edx
@@ -827,7 +827,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 12 
+	/* Round 12 */
 	movl	96(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	100(%ebp),	%edx
@@ -864,7 +864,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 11 
+	/* Round 11 */
 	movl	88(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	92(%ebp),	%edx
@@ -901,7 +901,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 10 
+	/* Round 10 */
 	movl	80(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	84(%ebp),	%edx
@@ -938,7 +938,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 9 
+	/* Round 9 */
 	movl	72(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	76(%ebp),	%edx
@@ -975,7 +975,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 8 
+	/* Round 8 */
 	movl	64(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	68(%ebp),	%edx
@@ -1012,7 +1012,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 7 
+	/* Round 7 */
 	movl	56(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	60(%ebp),	%edx
@@ -1049,7 +1049,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 6 
+	/* Round 6 */
 	movl	48(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	52(%ebp),	%edx
@@ -1086,7 +1086,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 5 
+	/* Round 5 */
 	movl	40(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	44(%ebp),	%edx
@@ -1123,7 +1123,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 4 
+	/* Round 4 */
 	movl	32(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	36(%ebp),	%edx
@@ -1160,7 +1160,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 3 
+	/* Round 3 */
 	movl	24(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	28(%ebp),	%edx
@@ -1197,7 +1197,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 2 
+	/* Round 2 */
 	movl	16(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	20(%ebp),	%edx
@@ -1234,7 +1234,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 1 
+	/* Round 1 */
 	movl	8(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	12(%ebp),	%edx
@@ -1271,7 +1271,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 0 
+	/* Round 0 */
 	movl	(%ebp),		%eax
 	xorl	%ebx,		%ebx
 	movl	4(%ebp),	%edx
@@ -1309,7 +1309,7 @@
 	xorl	%ebx,		%esi
 .L001end:
 
-	# FP 
+	/* FP */
 	movl	20(%esp),	%edx
 .byte 209
 .byte 206		# rorl $1 %esi 
@@ -1362,7 +1362,7 @@
 	pushl	%esi
 	pushl	%edi
 
-	# Load the 2 words 
+	/* Load the 2 words */
 	movl	12(%esp),	%eax
 	xorl	%ecx,		%ecx
 	pushl	%ebx
@@ -1376,7 +1376,7 @@
 	cmpl	$0,		%ebx
 	je	.L002start_decrypt
 
-	# Round 0 
+	/* Round 0 */
 	movl	(%ebp),		%eax
 	xorl	%ebx,		%ebx
 	movl	4(%ebp),	%edx
@@ -1413,7 +1413,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 1 
+	/* Round 1 */
 	movl	8(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	12(%ebp),	%edx
@@ -1450,7 +1450,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 2 
+	/* Round 2 */
 	movl	16(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	20(%ebp),	%edx
@@ -1487,7 +1487,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 3 
+	/* Round 3 */
 	movl	24(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	28(%ebp),	%edx
@@ -1524,7 +1524,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 4 
+	/* Round 4 */
 	movl	32(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	36(%ebp),	%edx
@@ -1561,7 +1561,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 5 
+	/* Round 5 */
 	movl	40(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	44(%ebp),	%edx
@@ -1598,7 +1598,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 6 
+	/* Round 6 */
 	movl	48(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	52(%ebp),	%edx
@@ -1635,7 +1635,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 7 
+	/* Round 7 */
 	movl	56(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	60(%ebp),	%edx
@@ -1672,7 +1672,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 8 
+	/* Round 8 */
 	movl	64(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	68(%ebp),	%edx
@@ -1709,7 +1709,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 9 
+	/* Round 9 */
 	movl	72(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	76(%ebp),	%edx
@@ -1746,7 +1746,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 10 
+	/* Round 10 */
 	movl	80(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	84(%ebp),	%edx
@@ -1783,7 +1783,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 11 
+	/* Round 11 */
 	movl	88(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	92(%ebp),	%edx
@@ -1820,7 +1820,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 12 
+	/* Round 12 */
 	movl	96(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	100(%ebp),	%edx
@@ -1857,7 +1857,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 13 
+	/* Round 13 */
 	movl	104(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	108(%ebp),	%edx
@@ -1894,7 +1894,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 14 
+	/* Round 14 */
 	movl	112(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	116(%ebp),	%edx
@@ -1931,7 +1931,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 15 
+	/* Round 15 */
 	movl	120(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	124(%ebp),	%edx
@@ -1970,7 +1970,7 @@
 	jmp	.L003end
 .L002start_decrypt:
 
-	# Round 15 
+	/* Round 15 */
 	movl	120(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	124(%ebp),	%edx
@@ -2007,7 +2007,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 14 
+	/* Round 14 */
 	movl	112(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	116(%ebp),	%edx
@@ -2044,7 +2044,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 13 
+	/* Round 13 */
 	movl	104(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	108(%ebp),	%edx
@@ -2081,7 +2081,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 12 
+	/* Round 12 */
 	movl	96(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	100(%ebp),	%edx
@@ -2118,7 +2118,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 11 
+	/* Round 11 */
 	movl	88(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	92(%ebp),	%edx
@@ -2155,7 +2155,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 10 
+	/* Round 10 */
 	movl	80(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	84(%ebp),	%edx
@@ -2192,7 +2192,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 9 
+	/* Round 9 */
 	movl	72(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	76(%ebp),	%edx
@@ -2229,7 +2229,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 8 
+	/* Round 8 */
 	movl	64(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	68(%ebp),	%edx
@@ -2266,7 +2266,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 7 
+	/* Round 7 */
 	movl	56(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	60(%ebp),	%edx
@@ -2303,7 +2303,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 6 
+	/* Round 6 */
 	movl	48(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	52(%ebp),	%edx
@@ -2340,7 +2340,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 5 
+	/* Round 5 */
 	movl	40(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	44(%ebp),	%edx
@@ -2377,7 +2377,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 4 
+	/* Round 4 */
 	movl	32(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	36(%ebp),	%edx
@@ -2414,7 +2414,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 3 
+	/* Round 3 */
 	movl	24(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	28(%ebp),	%edx
@@ -2451,7 +2451,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 2 
+	/* Round 2 */
 	movl	16(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	20(%ebp),	%edx
@@ -2488,7 +2488,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 1 
+	/* Round 1 */
 	movl	8(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	12(%ebp),	%edx
@@ -2525,7 +2525,7 @@
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 0 
+	/* Round 0 */
 	movl	(%ebp),		%eax
 	xorl	%ebx,		%ebx
 	movl	4(%ebp),	%edx
@@ -2563,7 +2563,7 @@
 	xorl	%ebx,		%esi
 .L003end:
 
-	# Fixup 
+	/* Fixup */
 	rorl	$3,		%edi
 	movl	20(%esp),	%eax
 	rorl	$3,		%esi
@@ -2584,12 +2584,12 @@
 	pushl   %esi
 	pushl   %edi
 
-	# Load the data words 
+	/* Load the data words */
 	movl    (%ebx),         %edi
 	movl    4(%ebx),        %esi
 	subl    $12,            %esp
 
-	# IP 
+	/* IP */
 	roll    $4,             %edi
 	movl    %edi,           %edx
 	xorl    %esi,           %edi
@@ -2648,7 +2648,7 @@
 	movl    (%ebx),         %edi
 	movl    4(%ebx),        %esi
 
-	# FP 
+	/* FP */
 	roll    $2,             %esi
 	roll    $3,             %edi
 	movl    %edi,           %eax
@@ -2703,12 +2703,12 @@
 	pushl   %esi
 	pushl   %edi
 
-	# Load the data words 
+	/* Load the data words */
 	movl    (%ebx),         %edi
 	movl    4(%ebx),        %esi
 	subl    $12,            %esp
 
-	# IP 
+	/* IP */
 	roll    $4,             %edi
 	movl    %edi,           %edx
 	xorl    %esi,           %edi
@@ -2767,7 +2767,7 @@
 	movl    (%ebx),         %edi
 	movl    4(%ebx),        %esi
 
-	# FP 
+	/* FP */
 	roll    $2,             %esi
 	roll    $3,             %edi
 	movl    %edi,           %eax
Index: sys/dev/disk/aic7xxx/aicasm/Makefile
===================================================================
RCS file: /home/dcvs/src/sys/dev/disk/aic7xxx/aicasm/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- sys/dev/disk/aic7xxx/aicasm/Makefile	16 Aug 2003 02:51:58 -0000	1.3
+++ sys/dev/disk/aic7xxx/aicasm/Makefile	12 Nov 2003 23:04:51 -0000
@@ -23,7 +23,7 @@
 DEPENDFILE=
 .endif
 
-CFLAGS+= -nostdinc -I/usr/include -I.
+CFLAGS+= -nostdinc -I/usr/include -I. -I${.CURDIR}
 .ifdef MAKESRCPATH
 CFLAGS+= -I${MAKESRCPATH}
 .endif
Index: sys/dev/misc/syscons/syscons.h
===================================================================
RCS file: /home/dcvs/src/sys/dev/misc/syscons/syscons.h,v
retrieving revision 1.4
diff -u -r1.4 syscons.h
--- sys/dev/misc/syscons/syscons.h	10 Nov 2003 06:12:06 -0000	1.4
+++ sys/dev/misc/syscons/syscons.h	12 Nov 2003 18:01:56 -0000
@@ -418,11 +418,11 @@
 extern struct linker_set scrndr_set;
 
 #define RENDERER(name, mode, sw, set)				\
-	static struct sc_renderer scrndr_##name##_##mode## = {	\
+	static struct sc_renderer scrndr_##name##_##mode = {	\
 		#name, mode, &sw				\
 	};							\
-	DATA_SET(scrndr_set, scrndr_##name##_##mode##);		\
-	DATA_SET(set, scrndr_##name##_##mode##)
+	DATA_SET(scrndr_set, scrndr_##name##_##mode);		\
+	DATA_SET(set, scrndr_##name##_##mode)
 
 #define RENDERER_MODULE(name, set)				\
 	SET_DECLARE(set, sc_renderer_t);			\
@@ -456,7 +456,7 @@
 		scrndr_##name##_event,				\
 		NULL,						\
 	};							\
-	DECLARE_MODULE(scrndr_##name##, scrndr_##name##_mod, 	\
+	DECLARE_MODULE(scrndr_##name, scrndr_##name##_mod, 	\
 		       SI_SUB_DRIVERS, SI_ORDER_MIDDLE)
 
 typedef struct {
Index: sys/dev/netif/ray/if_ray.c
===================================================================
RCS file: /home/dcvs/src/sys/dev/netif/ray/if_ray.c,v
retrieving revision 1.4
diff -u -r1.4 if_ray.c
--- sys/dev/netif/ray/if_ray.c	7 Aug 2003 21:17:04 -0000	1.4
+++ sys/dev/netif/ray/if_ray.c	12 Nov 2003 18:01:56 -0000
@@ -903,7 +903,7 @@
 	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_STARTJOIN, "");
 	RAY_MAP_CM(sc);
 
-#define MIB4(m)		ray_mib_4_default.##m
+#define MIB4(m)		ray_mib_4_default.m
 
 	MIB4(mib_net_type)		= com->c_desired.np_net_type;
 	MIB4(mib_ap_status)		= com->c_desired.np_ap_status;
@@ -967,7 +967,7 @@
 	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_STARTJOIN, "");
 	RAY_MAP_CM(sc);
 
-#define MIB5(m)		ray_mib_5_default.##m
+#define MIB5(m)		ray_mib_5_default.m
 	MIB5(mib_net_type)		= com->c_desired.np_net_type;
 	MIB5(mib_ap_status)		= com->c_desired.np_ap_status;
 	bcopy(com->c_desired.np_ssid, MIB5(mib_ssid), IEEE80211_NWID_LEN);
Index: sys/dev/netif/sbni/if_sbni.c
===================================================================
RCS file: /home/dcvs/src/sys/dev/netif/sbni/if_sbni.c,v
retrieving revision 1.7
diff -u -r1.7 if_sbni.c
--- sys/dev/netif/sbni/if_sbni.c	7 Aug 2003 21:17:04 -0000	1.7
+++ sys/dev/netif/sbni/if_sbni.c	12 Nov 2003 23:19:36 -0000
@@ -1164,7 +1164,7 @@
 static u_int32_t
 calc_crc32(u_int32_t crc, caddr_t p, u_int len)
 {
-	register u_int32_t  _crc __asm ("ax");
+	u_int32_t _crc;
 	_crc = crc;
 	
 	__asm __volatile (
@@ -1233,7 +1233,7 @@
 	"2:\n"
 		:
 		: "a" (_crc), "g" (p), "g" (len)
-		: "ax", "bx", "cx", "dx", "si", "di"
+		: "bx", "cx", "dx", "si", "di"
 	);
 
 	return (_crc);
Index: sys/dev/netif/wx/if_wx.c
===================================================================
RCS file: /home/dcvs/src/sys/dev/netif/wx/if_wx.c,v
retrieving revision 1.3
diff -u -r1.3 if_wx.c
--- sys/dev/netif/wx/if_wx.c	7 Aug 2003 21:17:06 -0000	1.3
+++ sys/dev/netif/wx/if_wx.c	12 Nov 2003 18:01:56 -0000
@@ -1403,8 +1403,8 @@
  * and, more importantly, garbage collect completed transmissions
  * and to handle link status changes.
  */
-#define	WX_PRT_STATS(sc, y)	printf("\t" # y " = %u\n", (sc)-> ## y )
-#define	WX_CLR_STATS(sc, y)	(sc)-> ## y  = 0
+#define	WX_PRT_STATS(sc, y)	printf("\t" # y " = %u\n", ((sc)->y))
+#define	WX_CLR_STATS(sc, y)	((sc)->y  = 0)
 
 static void
 wx_watchdog(void *arg)
Index: sys/i386/i386/identcpu.c
===================================================================
RCS file: /home/dcvs/src/sys/i386/i386/identcpu.c,v
retrieving revision 1.6
diff -u -r1.6 identcpu.c
--- sys/i386/i386/identcpu.c	29 Sep 2003 15:56:42 -0000	1.6
+++ sys/i386/i386/identcpu.c	12 Nov 2003 18:01:56 -0000
@@ -734,15 +734,14 @@
  */
 inthand_t	bluetrap6;
 __asm
-("
-	.text
-	.p2align 2,0x90
-	.type	" __XSTRING(CNAME(bluetrap6)) ", at function
-" __XSTRING(CNAME(bluetrap6)) ":
-	ss
-	movl	$0xa8c1d," __XSTRING(CNAME(trap_by_rdmsr)) "
-	addl	$2, (%esp)		  # I know rdmsr is a 2-bytes instruction.
-	iret
+("  .text																\n\
+	.p2align 2,0x90														\n\
+	.type	" __XSTRING(CNAME(bluetrap6)) ", at function					\n\
+" __XSTRING(CNAME(bluetrap6)) ":										\n\
+	ss																	\n\
+	movl	$0xa8c1d," __XSTRING(CNAME(trap_by_rdmsr)) "				\n\
+	addl	$2, (%esp)		  # I know rdmsr is a 2-bytes instruction.	\n\
+	iret																\n\
 ");
 
 /*
@@ -751,16 +750,15 @@
  */
 inthand_t	bluetrap13;
 __asm
-("
-	.text
-	.p2align 2,0x90
-	.type " __XSTRING(CNAME(bluetrap13)) ", at function
-" __XSTRING(CNAME(bluetrap13)) ":
-	ss
-	movl	$0xa89c4," __XSTRING(CNAME(trap_by_rdmsr)) "
-	popl	%eax				# discard errorcode.
-	addl	$2, (%esp)			# I know rdmsr is a 2-bytes instruction.
-	iret
+("  .text																\n\
+	.p2align 2,0x90														\n\
+	.type " __XSTRING(CNAME(bluetrap13)) ", at function					\n\
+" __XSTRING(CNAME(bluetrap13)) ":										\n\
+	ss																	\n\
+	movl	$0xa89c4," __XSTRING(CNAME(trap_by_rdmsr)) "				\n\
+	popl	%eax			# discard errorcode.						\n\
+	addl	$2, (%esp)		# I know rdmsr is a 2-bytes instruction.	\n\
+	iret																\n\
 ");
 
 /*
Index: sys/i386/i386/locore.s
===================================================================
RCS file: /home/dcvs/src/sys/i386/i386/locore.s,v
retrieving revision 1.8
diff -u -r1.8 locore.s
--- sys/i386/i386/locore.s	24 Oct 2003 14:10:45 -0000	1.8
+++ sys/i386/i386/locore.s	12 Nov 2003 18:01:56 -0000
@@ -96,9 +96,9 @@
 	.data
 	ALIGN_DATA		/* just to be sure */
 
-	.globl	HIDENAME(tmpstk)
+	.globl	.tmpstk
 	.space	0x2000		/* space for tmpstk - temporary stack */
-HIDENAME(tmpstk):
+.tmpstk:
 
 	.globl	boothowto,bootdev
 
@@ -274,7 +274,7 @@
  * the old stack, but it need not be, since recover_bootinfo actually
  * returns via the old frame.
  */
-	movl	$R(HIDENAME(tmpstk)),%esp
+	movl	$R(.tmpstk),%esp
 
 #ifdef PC98
 	/* pc98_machine_type & M_EPSON_PC98 */
Index: sys/kern/kern_lock.c
===================================================================
RCS file: /home/dcvs/src/sys/kern/kern_lock.c,v
retrieving revision 1.8
diff -u -r1.8 kern_lock.c
--- sys/kern/kern_lock.c	2 Oct 2003 22:27:00 -0000	1.8
+++ sys/kern/kern_lock.c	12 Nov 2003 18:01:56 -0000
@@ -186,13 +186,13 @@
 #else
 		    if (lockmgr_from_int == 2) {
 			    didpanic = 1;
-			    panic("
-				lockmgr %s from %s:%d: called from interrupt",
+			    panic(
+				"lockmgr %s from %s:%d: called from interrupt",
 				lkp->lk_wmesg, file, line);
 			    didpanic = 0;
 		    } else {
-			    printf("
-				lockmgr %s from %s:%d: called from interrupt\n",
+			    printf(
+				"lockmgr %s from %s:%d: called from interrupt\n",
 				lkp->lk_wmesg, file, line);
 		    }
 #endif
Index: sys/net/sppp/if_spppsubr.c
===================================================================
RCS file: /home/dcvs/src/sys/net/sppp/if_spppsubr.c,v
retrieving revision 1.6
diff -u -r1.6 if_spppsubr.c
--- sys/net/sppp/if_spppsubr.c	9 Nov 2003 02:22:36 -0000	1.6
+++ sys/net/sppp/if_spppsubr.c	12 Nov 2003 23:31:25 -0000
@@ -5039,7 +5039,7 @@
 	}
 
 	switch (subcmd) {
-	case SPPPIOGDEFS:
+	case (int)SPPPIOGDEFS:
 		if (cmd != SIOCGIFGENERIC) {
 			rv = EINVAL;
 			break;
@@ -5074,7 +5074,7 @@
 			     sizeof(struct spppreq));
 		break;
 
-	case SPPPIOSDEFS:
+	case (int)SPPPIOSDEFS:
 		if (cmd != SIOCSIFGENERIC) {
 			rv = EINVAL;
 			break;
Index: sys/vfs/coda/coda_subr.c
===================================================================
RCS file: /home/dcvs/src/sys/vfs/coda/coda_subr.c,v
retrieving revision 1.4
diff -u -r1.4 coda_subr.c
--- sys/vfs/coda/coda_subr.c	7 Aug 2003 21:17:40 -0000	1.4
+++ sys/vfs/coda/coda_subr.c	12 Nov 2003 18:01:56 -0000
@@ -417,12 +417,12 @@
 	      cp->c_flags &= ~C_VATTR;
 	      if (CTOV(cp)->v_flag & VTEXT)
 		  error = coda_vmflush(cp);
-	      CODADEBUG(CODA_ZAPFILE, myprintf(("zapfile: fid = (%lx.%lx.%lx), 
-                                              refcnt = %d, error = %d\n",
-					      cp->c_fid.Volume, 
-					      cp->c_fid.Vnode, 
-					      cp->c_fid.Unique, 
-					      CTOV(cp)->v_usecount - 1, error)););
+	      CODADEBUG(CODA_ZAPFILE, 
+		    	cp->c_fid.Volume, 
+			    cp->c_fid.Vnode, 
+			    cp->c_fid.Unique, 
+			    CTOV(cp)->v_usecount - 1, error)););
 	      if (CTOV(cp)->v_usecount == 1) {
 		  cp->c_flags |= C_PURGING;
 	      }
@@ -445,11 +445,12 @@
 	      cp->c_flags &= ~C_VATTR;
 	      coda_nc_zapParentfid(&out->coda_zapdir.CodaFid, IS_DOWNCALL);     
 	      
-	      CODADEBUG(CODA_ZAPDIR, myprintf(("zapdir: fid = (%lx.%lx.%lx), 
-                                          refcnt = %d\n",cp->c_fid.Volume, 
-					     cp->c_fid.Vnode, 
-					     cp->c_fid.Unique, 
-					     CTOV(cp)->v_usecount - 1)););
+	      CODADEBUG(CODA_ZAPDIR, 
+		  	myprintf(("zapdir: fid = (%lx.%lx.%lx), refcnt = %d\n",
+				cp->c_fid.Volume, 
+				cp->c_fid.Vnode, 
+				cp->c_fid.Unique, 
+				CTOV(cp)->v_usecount - 1)););
 	      if (CTOV(cp)->v_usecount == 1) {
 		  cp->c_flags |= C_PURGING;
 	      }
Index: share/mk/bsd.kern.mk
===================================================================
RCS file: /home/dcvs/src/share/mk/bsd.kern.mk,v
retrieving revision 1.2
diff -u -r1.2 bsd.kern.mk
--- share/mk/bsd.kern.mk	17 Jun 2003 04:37:02 -0000	1.2
+++ share/mk/bsd.kern.mk	12 Nov 2003 18:02:16 -0000
@@ -10,7 +10,7 @@
 #
 CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
-		-fformat-extensions -ansi
+		-fformat-extensions -ffreestanding -ansi
 #
 # The following flags are next up for working on:
 #	-W




More information about the Submit mailing list