[ros-diffs] [sserapion] 44578: Try to fix build with rosbe 1.5 x86

[sserapion at svn.reactos.org]

Author: sserapion
Date: Mon Dec 14 19:42:30 2009
New Revision: 44578

URL: http://svn.reactos.org/svn/reactos?rev=44578&view=rev
Log:
Try to fix build with rosbe 1.5 x86

Modified:
    branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/irp.c
    branches/ros-amd64-bringup/reactos/subsystems/win32/win32.rbuild
    branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak
    branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/irp.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/irp.c?rev=44578&r1=44577&r2=44578&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Mon Dec 14 19:42:30 2009
@@ -1622,7 +1622,7 @@
                         OUT PULONG pSessionId)
 {
     /* Return the session */
-    *pSessionId = IoGetRequestorProcess(Irp)->Session;
+    *pSessionId = (ULONG_PTR)IoGetRequestorProcess(Irp)->Session;
     return STATUS_SUCCESS;
 }
 

Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsystems/win32/win32.rbuild?rev=44578&r1=44577&r2=44578&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/subsystems/win32/win32.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32.rbuild [iso-8859-1] Mon Dec 14 19:42:30 2009
@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-<if property="USERMODE" value="1">
-	<directory name="csrss">
-		<xi:include href="csrss/csrss.rbuild" />
-	</directory>
-</if>
+<directory name="csrss">
+	<xi:include href="csrss/csrss.rbuild" />
+</directory>
 <directory name="win32k">
 	<xi:include href="win32k/win32k.rbuild" />
 </directory>

Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak?rev=44578&r1=44577&r2=44578&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] Mon Dec 14 19:42:30 2009
@@ -9,7 +9,11 @@
 
 # FIXME: disabled until RosBE stops sucking
 # BUILTIN_CPPFLAGS+= -nostdinc
+ifeq ($(ROS_ARCH),i386)
+BUILTIN_CFLAGS+= -fno-optimize-sibling-calls -fno-set-stack-executable
+else
 BUILTIN_CFLAGS+= -fno-optimize-sibling-calls
+endif
 BUILTIN_CXXFLAGS+= -fno-optimize-sibling-calls
 
 #(module, source, dependencies, cflags, output)

Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp?rev=44578&r1=44577&r2=44578&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Mon Dec 14 19:42:30 2009
@@ -480,8 +480,15 @@
 		fputs ( "BUILTIN_CXXINCLUDES+= $(TARGET_CPPFLAGS)\n", fMakefile );
 
 		fprintf ( fMakefile, "PROJECT_CCLIBS := \"$(shell ${TARGET_CC} -print-libgcc-file-name)\"\n" );
-        fprintf ( fMakefile, "PROJECT_CXXLIBS := \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-libgcc-file-name)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libgcc_eh.a)\"\n" );
-
+        fprintf ( fMakefile, "PROJECT_CXXLIBS := \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-libgcc-file-name)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\" " );
+
+		/* hack to get libgcc_eh.a, should check mingw version or something */
+		if (Environment::GetArch() == "amd64")
+			fprintf ( fMakefile, " \"$(shell ${TARGET_CPP} -print-file-name=libgcc_eh.a)\"" );
+		/* hack to get _get_output_format, needed by libmingwex */
+		else if (Environment::GetArch() == "i386")
+			fprintf ( fMakefile, "\"$(shell ${TARGET_CPP} -print-file-name=ofmt_stub.a)\"");
+		fprintf ( fMakefile,"\n");
 	}
 	MingwModuleHandler::GenerateParameters ( "PROJECT", "+=", ProjectNode.non_if_data );
 	MingwModuleHandler::GenerateParameters ( "PROJECT_HOST", "+=", ProjectNode.host_non_if_data );