[ros-diffs] [ros-arm-bringup] 32314: The kernel entrypoint is called KiSystemStartup, not NtProcessStartup. On ARM, don't prepend underscore to the kernel entrypoint. We now correctly jump into the kernel entrypoint, instead of random code!

[ros-arm-bringup at svn.reactos.org]

Author: ros-arm-bringup
Date: Tue Feb 12 09:15:35 2008
New Revision: 32314

URL: http://svn.reactos.org/svn/reactos?rev=32314&view=rev
Log:
The kernel entrypoint is called KiSystemStartup, not NtProcessStartup.
On ARM, don't prepend underscore to the kernel entrypoint.
We now correctly jump into the kernel entrypoint, instead of random code!

Modified:
    trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
    trunk/reactos/tools/rbuild/module.cpp

Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp?rev=32314&r1=32313&r2=32314&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Tue Feb 12 09:15:35 2008
@@ -2623,9 +2623,10 @@
 
 		string dependencies = linkDepsMacro + " " + objectsMacro;
 
-		string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s",
-		                                     module.GetEntryPoint(true).c_str (),
-		                                     module.baseaddress.c_str () );
+        string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s",
+                                            module.GetEntryPoint(!(Environment::GetArch() == "arm")).c_str (),
+                                            module.baseaddress.c_str () );
+        
 		GenerateLinkerCommand ( dependencies,
 					"${gcc}",
 					linkerParameters + " $(NTOSKRNL_SHARED)",

Modified: trunk/reactos/tools/rbuild/module.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?rev=32314&r1=32313&r2=32314&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/module.cpp (original)
+++ trunk/reactos/tools/rbuild/module.cpp Tue Feb 12 09:15:35 2008
@@ -1033,7 +1033,7 @@
 	switch ( type )
 	{
 		case Kernel:
-			return "NtProcessStartup";
+			return "KiSystemStartup";
 		case KernelModeDLL:
 		case KernelModeDriver:
 			return "DriverEntry at 8";