From: John Hodge <tpg@mutabah.net>
Date: Tue, 11 May 2010 02:18:09 +0000 (+0800)
Subject: Merge branch 'master' of serenade.mutabah.net:acess2
X-Git-Tag: rel0.06~197
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=3234a52a913609230ffc140c27542d421bb1b7d3;hp=b98fbd4e9c71447d81fc9bd643fb174c76346e0f;p=tpg%2Facess2.git

Merge branch 'master' of serenade.mutabah.net:acess2
---

diff --git a/Kernel/threads.c b/Kernel/threads.c
index c62f7268..b9b29923 100644
--- a/Kernel/threads.c
+++ b/Kernel/threads.c
@@ -693,24 +693,17 @@ tThread *Threads_GetNextToRun(int CPU)
 	 int	number;
 	
 	if(giNumActiveThreads == 0) {
-		//Log_Debug("Threads", "CPU%i has no threads to run", CPU);
 		return NULL;
 	}
 	
 	// Special case: 1 thread
 	if(giNumActiveThreads == 1) {
-		//Log_Debug("Threads", "CPU%i has only one thread %i %s",
-		//	CPU, gActiveThreads->TID, gActiveThreads->ThreadName);
 		return gActiveThreads;
 	}
 	
-	//Log(" Threads_GetNextToRun: giNumActiveThreads=%i,giTotalTickets=%i",
-	//	giNumActiveThreads, giTotalTickets);
 	// Get the ticket number
 	ticket = number = rand() % giTotalTickets;
 	
-	//Log(" Threads_GetNextToRun: ticket = %i", ticket);
-	
 	// Find the next thread
 	for(thread=gActiveThreads;thread;thread=thread->Next)
 	{
@@ -728,9 +721,6 @@ tThread *Threads_GetNextToRun(int CPU)
 			giTotalTickets, number);
 	}
 	
-	//Log_Debug("Threads", "Switching CPU%i to %p (%s)",
-	//	CPU, thread, thread->ThreadName);
-	
 	return thread;
 }
 
diff --git a/Makefile.cfg b/Makefile.cfg
index 991a98da..ad972f70 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -2,10 +2,10 @@
 # Acess2 Build Configuration
 #
 
-CC = gcc
-LD = ld
+CC = i586-elf-gcc
+LD = i586-elf-ld
 AS = nasm
-OBJDUMP = objdump
+OBJDUMP = i586-elf-objdump
 RM = @rm -f
 STRIP = strip
 MKDIR = mkdir