X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tools%2Fcvt_data.c;h=77792870b14e69a98bb406f9fd04b82f67857934;hb=ddaf8bd7aa44ee867e43988ba0bb7658dae6e6eb;hp=bf9840195c2da8fe2b130d0d4cd2632b833e7a6d;hpb=1f906263984019d6804c760d7ca6f8c162c5b78d;p=ia32rtools.git

diff --git a/tools/cvt_data.c b/tools/cvt_data.c
index bf98401..7779287 100644
--- a/tools/cvt_data.c
+++ b/tools/cvt_data.c
@@ -616,7 +616,8 @@ int main(int argc, char *argv[])
         }
         else if (is_label) {
           p = words[w];
-          if (IS_START(p, "loc_") || strchr(p, '?') || strchr(p, '@')
+          if (IS_START(p, "loc_") || IS_START(p, "__imp")
+             || strchr(p, '?') || strchr(p, '@')
              || bsearch(&p, rlist, rlist_cnt, sizeof(rlist[0]),
                   cmpstringp))
           {
@@ -625,7 +626,9 @@ int main(int argc, char *argv[])
           }
           else {
             check_var(fhdr, sym, p);
-            fprintf(fout, "_%s", p);
+            if (p[0] != '_')
+              fprintf(fout, "_");
+            fprintf(fout, "%s", p);
           }
         }
         else {