fixing merge conflicts

2 files changed, 4 insertions, 2 deletions

diff --git a/tools/preproc/c_file.cpp b/tools/preproc/c_file.cpp
index 5bfdee086..24b3453e8 100644
--- a/tools/preproc/c_file.cpp
+++ b/tools/preproc/c_file.cpp
@@ -139,6 +139,7 @@ bool CFile::ConsumeNewline()
     {
         m_pos += 2;
         m_lineNum++;
+        std::putchar('\n');
         return true;
     }
 
@@ -146,6 +147,7 @@ bool CFile::ConsumeNewline()
     {
         m_pos++;
         m_lineNum++;
+        std::putchar('\n');
         return true;
     }
 
diff --git a/tools/preproc/preproc.cpp b/tools/preproc/preproc.cpp
index 8320a2d27..c9c6042df 100644
--- a/tools/preproc/preproc.cpp
+++ b/tools/preproc/preproc.cpp
@@ -89,8 +89,8 @@ void PreprocAsmFile(std::string filename)
 
             if (globalLabel.length() != 0)
             {
-                std::printf("\t.global %s\n", globalLabel.c_str());
-                std::printf("%s:\n", globalLabel.c_str());
+                const char *s = globalLabel.c_str();
+                std::printf("%s: ; .global %s\n", s, s);
             }
             else
             {