[RBUILD]

[reactos.git] / reactos / tools / rbuild / backend / mingw / modulehandler.cpp

diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index 8bff6ea..fe0a268 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -2439,54 +2439,62 @@ void
 MingwBootLoaderModuleHandler::GenerateBootLoaderModuleTarget ()
 {
        fprintf ( fMakefile, "# BOOT LOADER MODULE TARGET\n" );
-       string targetName ( module.output->name );
        string targetMacro ( GetTargetMacro (module) );
-       string workingDirectory = GetWorkingDirectory ();
-       FileLocation junk_tmp ( TemporaryDirectory,
-                               "",
-                               module.name + ".junk.tmp" );
-       CLEAN_FILE ( junk_tmp );
        string objectsMacro = GetObjectsMacro ( module );
        string libsMacro = GetLibsMacro ();
 
        GenerateRules ();
+       
+       string objectsDir = "${call RBUILD_intermediate_dir,$(" + module.name + "_TARGET)}";
+       string rspFile = objectsDir + "$(SEP)" + module.name + "_objs.rsp";
+
+       /* Generate the rsp rule */
+       fprintf(fMakefile, "%s: $(%s_OBJS) %s | %s\n"
+               "\t$(ECHO_RSP)\n"
+               "\t-@${rm} $@ 2>$(NUL)\n"
+               "\t${cp} $(NUL) $@ >$(NUL)\n"
+               "\t$(foreach obj,$(%s_LIBS),$(Q)echo $(QUOTE)$(subst \\,\\\\,$(obj))$(QUOTE)>>$@$(NL))\n\n",
+               rspFile.c_str(),
+               module.name.c_str(),
+               module.xmlbuildFile.c_str(),
+               objectsDir.c_str(),
+               module.name.c_str());
 
        const FileLocation *target_file = GetTargetFilename ( module, NULL );
        fprintf ( fMakefile, "%s: %s %s | %s\n",
                  targetMacro.c_str (),
-                 objectsMacro.c_str (),
+                 rspFile.c_str(),
                  libsMacro.c_str (),
                  backend->GetFullPath ( *target_file ).c_str () );
 
        fprintf ( fMakefile, "\t$(ECHO_LD)\n" );
 
-       if (Environment::GetArch() == "arm")
-       {
-               fprintf ( fMakefile,
-                        "\t${gcc} -Wl,--subsystem,native -o %s %s %s %s -nostartfiles -nostdlib\n",
-                        backend->GetFullName ( junk_tmp ).c_str (),
-                        objectsMacro.c_str (),
-                        libsMacro.c_str (),
-                        GetLinkerMacro ().c_str ());
-       }
-       else
-       {
-               fprintf ( fMakefile,
-                        "\t${gcc} -Wl,--subsystem,native -Wl,-Ttext,0x8000 -o %s %s %s %s -nostartfiles -nostdlib\n",
-                        backend->GetFullName ( junk_tmp ).c_str (),
-                        objectsMacro.c_str (),
-                        libsMacro.c_str (),
-                        GetLinkerMacro ().c_str ());
-       }
-       fprintf ( fMakefile,
-                 "\t${objcopy} -O binary %s $@\n",
-                 backend->GetFullName ( junk_tmp ).c_str () );
-       GenerateBuildMapCode ( &junk_tmp );
-       fprintf ( fMakefile,
-                 "\t-@${rm} %s 2>$(NUL)\n",
-                 backend->GetFullName ( junk_tmp ).c_str () );
-
-       delete target_file;
+       string linkerScriptArgument;
+       if ( module.linkerScript != NULL ) {
+        linkerScriptArgument = ssprintf(" -T %s", backend->GetFullName(*module.linkerScript->file).c_str());
+       }
+
+    /* Link the stripped booloader */
+    fprintf(fMakefile,
+            "\t${ld} --strip-all --subsystem native --entry=%s --image-base=%s @%s $(PROJECT_CCLIBS) "
+            "$(BUILTIN_LDFLAGS) $(PROJECT_LDFLAGS) $(LDFLAG_DRIVER) %s -o $@\n",
+            module.GetEntryPoint().c_str(),
+            module.baseaddress.c_str(),
+            rspFile.c_str(),
+            linkerScriptArgument.c_str() );
+
+    /* Link an unstripped version */
+       fprintf(fMakefile,
+               "ifeq ($(ROS_BUILDNOSTRIP),yes)\n"
+               "\t${ld} --subsystem native --entry=%s --image-base=%s @%s $(PROJECT_CCLIBS) "
+               "$(BUILTIN_LDFLAGS) $(PROJECT_LDFLAGS) $(LDFLAG_DRIVER) %s -o %s$(SEP)%s.nostrip.sys\n"
+               "endif\n",
+               module.GetEntryPoint().c_str(),
+               module.baseaddress.c_str(),
+            rspFile.c_str(),
+               linkerScriptArgument.c_str(),
+               backend->GetFullPath(*target_file).c_str(),
+               module.name.c_str());
 }