From 23b5cc870ed43fb80a39768356ba072430f10735 Mon Sep 17 00:00:00 2001
From: Evgeny Vrublevsky <me@veg.by>
Date: Thu, 18 Oct 2018 12:54:15 +0300
Subject: [PATCH] Renamed to '--no-crt-lib'

---
 doc/cl65.sgml   |  7 ++++---
 src/cl65/main.c | 23 ++++++++++-------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/doc/cl65.sgml b/doc/cl65.sgml
index b83cd96f3..4591b42f7 100644
--- a/doc/cl65.sgml
+++ b/doc/cl65.sgml
@@ -103,7 +103,7 @@ Long options:
   --memory-model model          Set the memory model
   --module                      Link as a module
   --module-id id                Specify a module id for the linker
-  --no-rtl                      Don't link default runtime library
+  --no-crt-lib                  Don't link default C runtime library
   --o65-model model             Override the o65 model
   --obj file                    Link this object file
   --obj-path path               Specify an object file search path
@@ -186,9 +186,10 @@ There are a few remaining options that control the behaviour of cl65:
   seem to use cc65 to develop for the C64.
 
 
-  <tag><tt>--no-rtl</tt></tag>
+  <tag><tt>--no-crt-lib</tt></tag>
+
+  This option tells the cl65 to not include default C runtime library into the list of libraries.
 
-  This option disables default runtime library of target system.
 
 
   <tag><tt>-Wa options, --asm-args options</tt></tag>
diff --git a/src/cl65/main.c b/src/cl65/main.c
index 1e64af787..badf15585 100644
--- a/src/cl65/main.c
+++ b/src/cl65/main.c
@@ -139,7 +139,7 @@ static int Module = 0;
 
 /* Name of the target specific runtime library */
 static char* TargetLib  = 0;
-static int   NoRTL      = 0;
+static int   NoCrtLib   = 0;
 
 
 
@@ -415,12 +415,6 @@ static void SetTargetFiles (void)
     const char* TargetName = GetTargetName (Target);
     unsigned    TargetNameLen = strlen (TargetName);
 
-    if (NoRTL)
-    {
-        /* Default RunTime Library is disabled */
-        return;
-    }
-
     /* Set the library file */
     TargetLib = xmalloc (TargetNameLen + 4 + 1);
     memcpy (TargetLib, TargetName, TargetNameLen);
@@ -498,8 +492,11 @@ static void Link (void)
         CmdSetTarget (&LD65, Target);
     }
 
-    /* Determine which target libraries are needed */
-    SetTargetFiles ();
+    if (!NoCrtLib)
+    {
+        /* Determine which target libraries are needed */
+        SetTargetFiles ();
+    }
 
     /* Add all object files as parameters */
     for (I = 0; I < LD65.FileCount; ++I) {
@@ -819,7 +816,7 @@ static void Usage (void)
             "  --memory-model model\t\tSet the memory model\n"
             "  --module\t\t\tLink as a module\n"
             "  --module-id id\t\tSpecify a module ID for the linker\n"
-            "  --no-rtl\t\t\tDon't link default runtime library\n"
+            "  --no-crt-lib\t\t\tDon't link default C runtime library\n"
             "  --o65-model model\t\tOverride the o65 model\n"
             "  --obj file\t\t\tLink this object file\n"
             "  --obj-path path\t\tSpecify an object file search path\n"
@@ -1175,11 +1172,11 @@ static void OptModuleId (const char* Opt attribute ((unused)), const char* Arg)
 
 
 
-static void OptNoRTL (const char* Opt attribute ((unused)),
+static void OptNoCrtLib (const char* Opt attribute ((unused)),
                       const char* Arg attribute ((unused)))
 /* Disable default runtime library */
 {
-    NoRTL = 1;
+    NoCrtLib = 1;
 }
 
 
@@ -1386,7 +1383,7 @@ int main (int argc, char* argv [])
         { "--memory-model",      1, OptMemoryModel    },
         { "--module",            0, OptModule         },
         { "--module-id",         1, OptModuleId       },
-        { "--no-rtl",            0, OptNoRTL          },
+        { "--no-crt-lib",        0, OptNoCrtLib       },
         { "--o65-model",         1, OptO65Model       },
         { "--obj",               1, OptObj            },
         { "--obj-path",          1, OptObjPath        },
-- 
2.39.2