From 170ddc6e3323df14e206680f77f9caca14c566c1 Mon Sep 17 00:00:00 2001
From: Kugel Fuhr <98353208+kugelfuhr@users.noreply.github.com>
Date: Mon, 14 Jul 2025 11:35:53 +0200
Subject: [PATCH] Add a --warnings-as-errors option to cc65 for compatibility
 reasons.

---
 doc/cc65.sgml   | 14 +++++++++++++-
 src/ca65/main.c |  8 ++++++++
 src/cc65/main.c | 11 +++++++++++
 src/cl65/main.c |  1 +
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/doc/cc65.sgml b/doc/cc65.sgml
index 0fa43a906..fa48960af 100644
--- a/doc/cc65.sgml
+++ b/doc/cc65.sgml
@@ -110,6 +110,7 @@ Long options:
   --target sys                  Set the target system
   --verbose                     Increase verbosity
   --version                     Print the compiler version number
+  --warnings-as-errors          Treat warnings as errors
   --writable-strings            Make string literals writable
 ---------------------------------------------------------------------------
 </verb></tscreen>
@@ -656,6 +657,15 @@ Here is a description of all the command line options:
   or warnings are encountered.
 
 
+  <label id="option--warnings-as-errors">
+  <tag><tt>--warnings-as-errors</tt></tag>
+
+  Treat all warnings as error. This makes the compiler exit with an appropriate
+  error code in case of warnings. The effect of this switch is identical to
+  the command line option <tt/<ref id="option-W" name="-W error">/. It is
+  available for compatibility with the other tools.
+
+
   <label id="option-writable-strings">
   <tag><tt>--writable-strings</tt></tag>
 
@@ -766,7 +776,9 @@ Here is a description of all the command line options:
   <tag><tt/const-comparison/</tag>
         Warn if the result of a comparison is constant.
   <tag><tt/error/</tag>
-        Treat all warnings as errors.
+        Treat all warnings as errors. This has the same effect as using the
+        <tt/<ref id="option--warnings-as-errors" name="--warnings-as-errors">/
+        option.
   <tag><tt/no-effect/</tag>
         Warn about statements that don't have an effect.
   <tag><tt/pointer-sign/</tag>
diff --git a/src/ca65/main.c b/src/ca65/main.c
index 0e5195757..66ba331dd 100644
--- a/src/ca65/main.c
+++ b/src/ca65/main.c
@@ -742,6 +742,8 @@ static void OptVersion (const char* Opt attribute ((unused)),
     exit (EXIT_SUCCESS);
 }
 
+
+
 static void OptSeglist (const char* Opt attribute ((unused)),
     const char* Arg attribute ((unused)))
     /* Enable segment listing */
@@ -749,6 +751,8 @@ static void OptSeglist (const char* Opt attribute ((unused)),
     SegList = 1;
 }
 
+
+
 static void OptWarningsAsErrors (const char* Opt attribute ((unused)),
                                  const char* Arg attribute ((unused)))
 /* Generate an error if any warnings occur */
@@ -756,6 +760,8 @@ static void OptWarningsAsErrors (const char* Opt attribute ((unused)),
     WarningsAsErrors = 1;
 }
 
+
+
 static void OptExpandMacros (const char* Opt attribute ((unused)),
     const char* Arg attribute ((unused)))
     /* Expand macros in listing
@@ -767,6 +773,8 @@ static void OptExpandMacros (const char* Opt attribute ((unused)),
     ExpandMacros++;
 }
 
+
+
 static void DoPCAssign (void)
 /* Start absolute code */
 {
diff --git a/src/cc65/main.c b/src/cc65/main.c
index 5fc6ea343..e1c37d26a 100644
--- a/src/cc65/main.c
+++ b/src/cc65/main.c
@@ -140,6 +140,7 @@ static void Usage (void)
             "  --target sys\t\t\tSet the target system\n"
             "  --verbose\t\t\tIncrease verbosity\n"
             "  --version\t\t\tPrint the compiler version number\n"
+            "  --warnings-as-errors\t\tTreat warnings as errors\n"
             "  --writable-strings\t\tMake string literals writable\n",
             ProgName);
 }
@@ -968,6 +969,15 @@ static void OptWarning (const char* Opt attribute ((unused)), const char* Arg)
 
 
 
+static void OptWarningsAsErrors (const char* Opt attribute ((unused)),
+                                 const char* Arg attribute ((unused)))
+/* Generate an error if any warnings occur */
+{
+    IS_Set (&WarningsAreErrors, 1);
+}
+
+
+
 static void OptWritableStrings (const char* Opt attribute ((unused)),
                                 const char* Arg attribute ((unused)))
 /* Make string literals writable */
@@ -1016,6 +1026,7 @@ int main (int argc, char* argv[])
         { "--target",               1,      OptTarget               },
         { "--verbose",              0,      OptVerbose              },
         { "--version",              0,      OptVersion              },
+        { "--warnings-as-errors",   0,      OptWarningsAsErrors     },
         { "--writable-strings",     0,      OptWritableStrings      },
     };
 
diff --git a/src/cl65/main.c b/src/cl65/main.c
index 8d3fd6e43..3339ebda1 100644
--- a/src/cl65/main.c
+++ b/src/cl65/main.c
@@ -1441,6 +1441,7 @@ static void OptWarningsAsErrors (const char* Opt attribute ((unused)),
 /* Handle the --warnings-as-errors option */
 {
     CmdAddArg (&CA65, "--warnings-as-errors");
+    CmdAddArg (&CC65, "--warnings-as-errors");
     CmdAddArg (&LD65, "--warnings-as-errors");
 }