tools: allow discard1/2 to place discard in a given segment

diff --git a/Kernel/tools/bankld/lkrloc3.c b/Kernel/tools/bankld/lkrloc3.c
index 0dd7ffd..98c862c 100644 (file)
--- a/Kernel/tools/bankld/lkrloc3.c
+++ b/Kernel/tools/bankld/lkrloc3.c
@@ -183,6 +183,10 @@ static int bankmagic(struct areax *ax)
                 return 3;
         if (strcmp(a->a_id, "_DISCARD") == 0)
                 return 0;
+        if (strcmp(a->a_id, "_DISCARD1") == 0)
+                return 1;
+        if (strcmp(a->a_id, "_DISCARD2") == 0)
+                return 2;
         if (strncmp(a->a_id, "_CODE", 5))
                 return 0;
         if (a->a_id[5] == 0)   /* We count _CODE and _CODE1 both as first bank */

diff --git a/Kernel/tools/binmunge.c b/Kernel/tools/binmunge.c
index cfa981d..4ddc512 100644 (file)
--- a/Kernel/tools/binmunge.c
+++ b/Kernel/tools/binmunge.c
@@ -219,7 +219,7 @@ int stub_code(char *name)
     return 1;
   if(strcmp(name, "_COMMONMEM") == 0)
     return 1;
-  if(strcmp(name, "_DISCARD") == 0)
+  if(strncmp(name, "_DISCARD", 8) == 0)
     return 1;
   if(strncmp(name, "_BOOT", 5) == 0)
     return 1;