From ad1eadd60ddd174605f88318c0b0faee34ed939d Mon Sep 17 00:00:00 2001
From: Chris Cacciatore <chris.cacciatore@gmail.com>
Date: Fri, 8 May 2020 15:33:30 -0700
Subject: [PATCH] Added support for --large-alignment in ld65.

Implemented the same way as in ca65.
---
 doc/ld65.sgml       |  7 +++++++
 src/ld65/global.c   |  6 ++++--
 src/ld65/global.h   |  2 ++
 src/ld65/main.c     | 10 ++++++++++
 src/ld65/segments.c |  2 +-
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/doc/ld65.sgml b/doc/ld65.sgml
index 97233271c..f3ba3bdc9 100644
--- a/doc/ld65.sgml
+++ b/doc/ld65.sgml
@@ -79,6 +79,7 @@ Long options:
   --end-group                   End a library group
   --force-import sym            Force an import of symbol 'sym'
   --help                        Help (this text)
+  --large-alignment             Don't warn about large alignments
   --lib file                    Link this library
   --lib-path path               Specify a library search path
   --mapfile name                Create a map file
@@ -298,6 +299,12 @@ Here is a description of all of the command-line options:
   information generation is currently being developed, so the format of the
   file and its contents are subject to change without further notice.
 
+  <label id="option--large-alignment">
+  <tag><tt>--large-alignment</tt></tag>
+
+  Disable warnings about a large combined alignment. See the discussion of the
+  <tt><ref id=".ALIGN" name=".ALIGN"></tt> directive for futher information.
+
 
   <tag><tt>--lib file</tt></tag>
 
diff --git a/src/ld65/global.c b/src/ld65/global.c
index 59c3754e6..8f43232fe 100644
--- a/src/ld65/global.c
+++ b/src/ld65/global.c
@@ -52,8 +52,10 @@ unsigned ModuleId           = 0;        /* Id for o65 module */
 unsigned char HaveStartAddr = 0;        /* Start address not given */
 unsigned long StartAddr     = 0x200;    /* Start address */
 
-unsigned char VerboseMap    = 0;        /* Verbose map file */
-unsigned char AllowMultDef  = 0;        /* Allow multiple definitions */
+unsigned char VerboseMap     = 0;       /* Verbose map file */
+unsigned char AllowMultDef   = 0;       /* Allow multiple definitions */
+unsigned char LargeAlignment = 0;       /* Don't warn about large alignments */
+
 const char* MapFileName     = 0;        /* Name of the map file */
 const char* LabelFileName   = 0;        /* Name of the label file */
 const char* DbgFileName     = 0;        /* Name of the debug file */
diff --git a/src/ld65/global.h b/src/ld65/global.h
index 6af265f45..a923f6de5 100644
--- a/src/ld65/global.h
+++ b/src/ld65/global.h
@@ -54,6 +54,8 @@ extern unsigned long    StartAddr;      /* Start address */
 
 extern unsigned char    VerboseMap;     /* Verbose map file */
 extern unsigned char    AllowMultDef;   /* Allow multiple definitions */
+extern unsigned char    LargeAlignment; /* Don't warn about large alignments */
+
 extern const char*      MapFileName;    /* Name of the map file */
 extern const char*      LabelFileName;  /* Name of the label file */
 extern const char*      DbgFileName;    /* Name of the debug file */
diff --git a/src/ld65/main.c b/src/ld65/main.c
index a3fd81143..f2415a914 100644
--- a/src/ld65/main.c
+++ b/src/ld65/main.c
@@ -136,6 +136,7 @@ static void Usage (void)
             "  --end-group\t\t\tEnd a library group\n"
             "  --force-import sym\t\tForce an import of symbol 'sym'\n"
             "  --help\t\t\tHelp (this text)\n"
+            "  --large-alignment\t\tDon't warn about large alignments\n"
             "  --lib file\t\t\tLink this library\n"
             "  --lib-path path\t\tSpecify a library search path\n"
             "  --mapfile name\t\tCreate a map file\n"
@@ -406,6 +407,14 @@ static void OptHelp (const char* Opt attribute ((unused)),
 
 
 
+static void OptLargeAlignment (const char* Opt attribute ((unused)),
+                               const char* Arg attribute ((unused)))
+/* Don't warn about large alignments */
+{
+    LargeAlignment = 1;
+}
+
+
 static void OptLib (const char* Opt attribute ((unused)), const char* Arg)
 /* Link a library */
 {
@@ -617,6 +626,7 @@ static void ParseCommandLine(void)
         { "--end-group",                 0,      CmdlOptEndGroup         },
         { "--force-import",              1,      OptForceImport          },
         { "--help",                      0,      OptHelp                 },
+        { "--large-alignment",           0,      OptLargeAlignment       },
         { "--lib",                       1,      OptLib                  },
         { "--lib-path",                  1,      OptLibPath              },
         { "--mapfile",                   1,      OptMapFile              },
diff --git a/src/ld65/segments.c b/src/ld65/segments.c
index 56a4719ad..10d2cda2c 100644
--- a/src/ld65/segments.c
+++ b/src/ld65/segments.c
@@ -230,7 +230,7 @@ Section* ReadSection (FILE* F, ObjData* O)
                    "%lu. Last module requiring alignment was '%s'.",
                    GetString (Name), Alignment, MAX_ALIGNMENT,
                    GetObjFileName (O));
-        } else if (Alignment >= LARGE_ALIGNMENT) {
+        } else if (Alignment >= LARGE_ALIGNMENT && !LargeAlignment) {
             Warning ("Combined alignment for segment '%s' is suspiciously "
                      "large (%lu). Last module requiring alignment was '%s'.",
                      GetString (Name), Alignment, GetObjFileName (O));