From mint-bounce@lists.fishpool.fi  Tue May 30 22:49:55 2006
X-Original-To: fnaumann@mail.boerde.de
Delivered-To: fnaumann@mail.boerde.de
Subject: [MiNT] build fixes for FreeMint CVS
From: Alan Hourihane <alanh@fairlite.demon.co.uk>
To: Mint List <mint@fishpool.com>
In-Reply-To: <1148991426.10595.25.camel@jetpack.demon.co.uk>
References: <446A3D38.8010207@free.fr>
	 <1147815879.19197.31.camel@mduckworth.phillypark.net>
	 <1148987399.10596.21.camel@jetpack.demon.co.uk>
	 <Pine.NEB.4.64.0605301334440.16208@wh58-508.st.uni-magdeburg.de>
	 <1148991426.10595.25.camel@jetpack.demon.co.uk>
Content-Type: multipart/mixed; boundary="=-rWGN9e3+vJyToNhhk7ks"
Date: Tue, 30 May 2006 21:43:04 +0100
Message-Id: <1149021784.10596.43.camel@jetpack.demon.co.uk>
Mime-Version: 1.0
X-Mailer: Evolution 2.4.2.1 
X-ecartis-version: Ecartis v1.0.0
Sender: mint-bounce@lists.fishpool.fi
Errors-To: mint-bounce@lists.fishpool.fi
X-original-sender: alanh@fairlite.demon.co.uk
Precedence: bulk
List-help: <mailto:ecartis@lists.fishpool.fi?Subject=help>
List-unsubscribe: <mailto:mint-request@lists.fishpool.fi?Subject=unsubscribe>
List-Id: <mint.lists.fishpool.fi>
X-List-ID: <mint.lists.fishpool.fi>
List-subscribe: <mailto:mint-request@lists.fishpool.fi?Subject=subscribe>
List-owner: <mailto:tjhukkan@fishpool.fi>
List-post: <mailto:mint@lists.fishpool.fi>
X-Virus-Scanned: by amavisd-new at relay.boerde.de
X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on relay.boerde.de
X-Spam-Status: No, hits=-1.0 tagged_above=-50.5 required=7.0 tests=BAYES_00
X-Spam-Level: 


--=-rWGN9e3+vJyToNhhk7ks
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

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.

--=-rWGN9e3+vJyToNhhk7ks
Content-Disposition: attachment; filename=freemint.patch
Content-Type: text/x-patch; name=freemint.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

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)

--=-rWGN9e3+vJyToNhhk7ks--