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

Re: [MiNT] [PATCH] FreeMiNT build broken (trunk)



On 27/09/2012 02:01, Alan Hourihane wrote:
cd .compile_000; make all
...
../check_exc.c: In function 'check_priv':
../check_exc.c:539:7: error: unused variable 'emulate_obsolete_instructions'

Damn, I forgot to check the 000 kernel compilation.
Thanks for the fix this morning, Alan.

Here is an additional patch for this issue, I just changed a little the defines and the comments to me more consistent.

native_coldfire_fix.patch
Better conditional compilation. Contributed by Vincent Riviere.

Alan, please commit!

BTW, Alan, you should update your e-mail address in the From field of the automatic build reports.

--
Vincent Rivière
diff -aurN -x CVS freemint.orig/sys/arch/check_exc.c freemint/sys/arch/check_exc.c
--- freemint.orig/sys/arch/check_exc.c	2012-09-27 08:39:17.000000000 +0200
+++ freemint/sys/arch/check_exc.c	2012-09-27 11:12:47.917234100 +0200
@@ -536,14 +536,15 @@
 long _cdecl
 check_priv(struct privilege_violation_stackframe *frame)
 {
-#if defined(__mcoldfire__) || !defined(M68000)
+# ifndef M68000
+	/* Backward compatibility with older processors */
 	bool emulate_obsolete_instructions = true;
-#endif
+# endif
 	ushort opcode;
 	opcode = *frame->pc;
 	UNUSED(opcode);
 
-#ifdef __mcoldfire__
+# ifdef __mcoldfire__
 	if (!coldfire_68k_emulation)
 	{
 		/* Fortunately, pure ColdFire programs are brand new
@@ -551,7 +552,7 @@
 		 */
 		emulate_obsolete_instructions = false;
 	}
-#endif
+# endif
 
 # ifndef M68000
 	/* Emulate the "move from sr" instruction,