X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=link%2Fz80%2Flkmain.c;h=c6cc8b29fcded57a27a26c7237271560c386cdad;hb=88e560b915dc753c85898e35af1e0a751a4cf723;hp=cf1b4745e765d5b121dd20905d6ea75920d489ec;hpb=4abb85b811b68813bc2a507e120b7dcbe3cad25f;p=fw%2Fsdcc

diff --git a/link/z80/lkmain.c b/link/z80/lkmain.c
index cf1b4745..c6cc8b29 100644
--- a/link/z80/lkmain.c
+++ b/link/z80/lkmain.c
@@ -488,6 +488,29 @@ link()
 	if ((c=endline()) == 0) { return; }
 	switch (c) {
 
+    case 'O': /*For some important sdcc options*/
+        if (pass == 0)
+        {
+            if(strlen(sdccopt)==0)
+            {
+                strcpy(sdccopt, &ip[1]);
+                strcpy(sdccopt_module, curr_module);
+            }
+            else
+            {
+                if(strcmp(sdccopt, &ip[1])!=0)
+                {
+				    fprintf(stderr,
+				    "?ASlink-Warning-Conflicting sdcc options:\n"
+                    "   \"%s\" in module \"%s\" and\n"
+                    "   \"%s\" in module \"%s\".\n",
+                    sdccopt, sdccopt_module, &ip[1], curr_module);
+				    lkerr++;
+                }
+            }
+        }
+		break;
+
 	case 'X':
 		radix = 16;
 		break;
@@ -517,7 +540,10 @@ link()
 
 	case 'M':
 		if (pass == 0)
+        {
+            strcpy(curr_module, &ip[1]);
 			module();
+        }
 		break;
 
 	case 'A':