[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[MiNT] build fixes for FreeMint CVS



I'm just building FreeMiNT CVS with my newly compiled gcc 3.3.6.

It's popping up quite a few warnings with inlining and a few others, but
these patches below are necessary to at least get it to build.

I'm tracking some runtime issues now though.

Alan.
Index: sys/floppy.c
===================================================================
RCS file: /mint/freemint/sys/floppy.c,v
retrieving revision 1.4
diff -u -r1.4 floppy.c
--- sys/floppy.c	12 Jan 2003 01:49:28 -0000	1.4
+++ sys/floppy.c	30 May 2006 21:09:10 -0000
@@ -373,11 +373,11 @@
 	(void)floppy_interrupt();
 
 	asm volatile
-	(
-		"_floppy_interrupt_asm:
-		 movem.l %%a0-%%a2/%%d0-%%d2,-(%%sp)
-		 bsr		 _floppy_interrupt
-		 movem.l (%%sp)+,%%a0-%%a2/%%d0-%%d2
+	("\
+		_floppy_interrupt_asm: \
+		 movem.l %%a0-%%a2/%%d0-%%d2,-(%%sp) \
+		 bsr		 _floppy_interrupt \
+		 movem.l (%%sp)+,%%a0-%%a2/%%d0-%%d2 \
 		 rte"
 		: 			/* output register */
 		:			/* input registers */
@@ -1044,4 +1044,4 @@
 	while(--delay);
 }
 
-#endif /* FLOPPY_ROUTINES */
\ No newline at end of file
+#endif /* FLOPPY_ROUTINES */
Index: sys/xfs/ext2fs/bitmap.h
===================================================================
RCS file: /mint/freemint/sys/xfs/ext2fs/bitmap.h,v
retrieving revision 1.3
diff -u -r1.3 bitmap.h
--- sys/xfs/ext2fs/bitmap.h	26 Nov 2005 11:17:07 -0000	1.3
+++ sys/xfs/ext2fs/bitmap.h	30 May 2006 21:09:12 -0000
@@ -131,7 +131,7 @@
 INLINE long
 ext2_find_first_zero_bit (const void *vaddr, ulong size)
 {
-	const ulong long *p = vaddr, *addr = vaddr;
+	const ullong *p = vaddr, *addr = vaddr;
 	long res;
 	
 	if (!size)
@@ -155,8 +155,8 @@
 INLINE long
 ext2_find_next_zero_bit (const void *vaddr, ulong size, ulong offset)
 {
-	const ulong long *addr = vaddr;
-	const ulong long *p = addr + (offset >> 5);
+	const ullong *addr = vaddr;
+	const ullong *p = addr + (offset >> 5);
 	long bit = offset & 31L, res;
 	
 	if (offset >= size)