[ros-diffs] [sserapion] 45596: Reduce diferences with trunk.
sserapion at svn.reactos.org
sserapion at svn.reactos.org
Mon Feb 15 07:14:17 CET 2010
Author: sserapion
Date: Mon Feb 15 07:14:17 2010
New Revision: 45596
URL: http://svn.reactos.org/svn/reactos?rev=45596&view=rev
Log:
Reduce diferences with trunk.
Modified:
branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/linkers/ld.mak
branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp
branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/linkers/ld.mak
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/linkers/ld.mak?rev=45596&r1=45595&r2=45596&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/linkers/ld.mak [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/linkers/ld.mak [iso-8859-1] Mon Feb 15 07:14:17 2010
@@ -87,4 +87,4 @@
#~ #(module, def, deps, ldflags, libs, entry, base)
#~ RBUILD_LINK_RULE=${call RBUILD_LINK,$(1),$(value $(1)_OBJS),$(3),$(4),$(value $(1)_TARGET),$(2),$(5) $(value $(1)_LIBS) $(5),$(6),$(7)}
#(module, def, deps, ldflags, libs, entry, base, extralibs)
-RBUILD_LINK_RULE=${call RBUILD_LINK,$(1),$(value $(1)_OBJS),$(3),$(4),$(value $(1)_TARGET),$(2),$(value $(1)_LIBS),$(6),$(7),$(5)}
+RBUILD_LINK_RULE=${call RBUILD_LINK,$(1),$(value $(1)_OBJS),$(3),$(4),$(value $(1)_TARGET),$(2),$(value $(1)_LIBS),$(6),$(7),$(5)}
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=45596&r1=45595&r2=45596&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 Feb 15 07:14:17 2010
@@ -487,8 +487,11 @@
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)\" " );
+
/* 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)\"");
@@ -977,7 +980,7 @@
{
int digit = binutilsVersion.find_last_of(".");
if(digit == -1)
- {
+ {
printf("Unable to detect binutils version!\n");
return false;
}
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp?rev=45596&r1=45595&r2=45596&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Mon Feb 15 07:14:17 2010
@@ -1471,11 +1471,11 @@
module.name.c_str(),
definitionFilename.c_str(),
module.xmlbuildFile.c_str(),
- linkerScriptArgument.c_str (),
+ linkerScriptArgument.c_str(),
extraLibraries.c_str(),
module.GetEntryPoint().c_str(),
module.baseaddress.c_str() );
- }
+}
void
MingwModuleHandler::GenerateObjectFileTargets ( const IfableData& data )
@@ -1782,12 +1782,6 @@
&module.linkerFlags,
used_defs );
- /* LD automatically exports all symbols by default if -shared is specified. Prevent it from doing
- this by adding the option -exclude-all-symbols (available since Binutils 20091017). */
- // FIXME: Should only be applied for -shared modules, when there's a smart way to check for them.
- if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse && !module.importLibrary )
- fprintf ( fMakefile, "%s_LDFLAGS+=$(LDFLAG_EXCLUDE_ALL_SYMBOLS)\n", module.name.c_str() );
-
fprintf ( fMakefile, "\n\n" );
}
@@ -1822,7 +1816,7 @@
const FileLocation* ar_target = GenerateArchiveTarget ();
if ( ar_target )
- delete ar_target;
+ delete ar_target;
}
@@ -2195,9 +2189,9 @@
void
MingwKernelModuleHandler::GenerateKernelModuleTarget ()
{
- GenerateRules ();
+ GenerateRules ();
GenerateLinkerCommand ();
- }
+}
MingwKernelModeDLLModuleHandler::MingwKernelModeDLLModuleHandler (
@@ -2224,9 +2218,9 @@
void
MingwKernelModeDLLModuleHandler::GenerateKernelModeDLLModuleTarget ()
{
- GenerateRules ();
+ GenerateRules ();
GenerateLinkerCommand ();
- }
+}
MingwNativeDLLModuleHandler::MingwNativeDLLModuleHandler (
@@ -2252,9 +2246,9 @@
void
MingwNativeDLLModuleHandler::GenerateNativeDLLModuleTarget ()
{
- GenerateRules ();
+ GenerateRules ();
GenerateLinkerCommand ();
- }
+}
MingwNativeCUIModuleHandler::MingwNativeCUIModuleHandler (
@@ -2280,9 +2274,9 @@
void
MingwNativeCUIModuleHandler::GenerateNativeCUIModuleTarget ()
{
- GenerateRules ();
+ GenerateRules ();
GenerateLinkerCommand ();
- }
+}
MingwWin32DLLModuleHandler::MingwWin32DLLModuleHandler (
@@ -2349,9 +2343,9 @@
void
MingwWin32DLLModuleHandler::GenerateWin32DLLModuleTarget ()
{
- GenerateRules ();
+ GenerateRules ();
GenerateLinkerCommand ();
- }
+}
void
@@ -2369,9 +2363,9 @@
void
MingwWin32OCXModuleHandler::GenerateWin32OCXModuleTarget ()
{
- GenerateRules ();
+ GenerateRules ();
GenerateLinkerCommand ();
- }
+}
MingwWin32CUIModuleHandler::MingwWin32CUIModuleHandler (
@@ -2396,9 +2390,9 @@
void
MingwWin32CUIModuleHandler::GenerateWin32CUIModuleTarget ()
{
- GenerateRules ();
+ GenerateRules ();
GenerateLinkerCommand ();
- }
+}
MingwWin32GUIModuleHandler::MingwWin32GUIModuleHandler (
@@ -2423,9 +2417,9 @@
void
MingwWin32GUIModuleHandler::GenerateWin32GUIModuleTarget ()
{
- GenerateRules ();
+ GenerateRules ();
GenerateLinkerCommand ();
- }
+}
MingwBootLoaderModuleHandler::MingwBootLoaderModuleHandler (
@@ -3024,9 +3018,9 @@
void
MingwTestModuleHandler::GenerateTestModuleTarget ()
{
- GenerateRules ();
+ GenerateRules ();
GenerateLinkerCommand ();
- }
+}
MingwAliasModuleHandler::MingwAliasModuleHandler (
@@ -3107,4 +3101,4 @@
delete target_file;
fprintf ( fMakefile, "#/ELF EXECUTABLE TARGET\n" );
-}
+}
More information about the Ros-diffs
mailing list