From df694c76e8a618d9e597b51d8f6f787113f6e8de Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Mon, 8 Nov 1999 10:37:12 +0000
Subject: [PATCH]   * filename fixes for win32 imports for units with multiple
 needed dll's

---
 compiler/assemble.pas | 16 ++++++++++++----
 compiler/og386.pas    | 16 ++++++++++++----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/compiler/assemble.pas b/compiler/assemble.pas
index daa7e7e11c..d582c4636a 100644
--- a/compiler/assemble.pas
+++ b/compiler/assemble.pas
@@ -49,6 +49,7 @@ type
     objfile,
     as_bin   : string;
     SmartAsm : boolean;
+    smarthcount : longint;
     place    : TCutPlace; { special 'end' file for import dir ? }
   {outfile}
     AsmSize,
@@ -255,11 +256,14 @@ begin
    Message(asmw_f_too_many_asm_files);
   case place of
     cut_begin :
-      s:=current_module^.asmprefix^+'h';
+      begin
+        inc(smarthcount);
+        s:=current_module^.asmprefix^+tostr(smarthcount)+'h';
+      end;
     cut_normal :
-      s:=current_module^.asmprefix^+'s';
+      s:=current_module^.asmprefix^+tostr(smarthcount)+'s';
     cut_end :
-      s:=current_module^.asmprefix^+'t';
+      s:=current_module^.asmprefix^+tostr(smarthcount)+'t';
   end;
   AsmFile:=Path+FixFileName(s+tostr(SmartLinkFilesCnt)+target_info.asmext);
   ObjFile:=Path+FixFileName(s+tostr(SmartLinkFilesCnt)+target_info.objext);
@@ -433,6 +437,7 @@ begin
   SmartLinkFilesCnt:=0;
   place:=cut_normal;
   SmartAsm:=smart;
+  SmartHCount:=0;
 { Which path will be used ? }
   if SmartAsm then
    begin
@@ -559,7 +564,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.56  1999-11-06 14:34:17  peter
+  Revision 1.57  1999-11-08 10:37:12  peter
+    * filename fixes for win32 imports for units with multiple needed dll's
+
+  Revision 1.56  1999/11/06 14:34:17  peter
     * truncated log to 20 revs
 
   Revision 1.55  1999/11/02 15:06:57  peter
diff --git a/compiler/og386.pas b/compiler/og386.pas
index d1aa5f1dc5..2ec619986c 100644
--- a/compiler/og386.pas
+++ b/compiler/og386.pas
@@ -57,6 +57,7 @@ unit og386;
 
        pobjectoutput = ^tobjectoutput;
        tobjectoutput = object
+         smarthcount : longint;
          objsmart  : boolean;
          writer    : pobjectwriter;
          path      : pathstr;
@@ -155,6 +156,7 @@ unit og386;
       var
         i : longint;
       begin
+        smarthcount:=0;
         objsmart:=smart;
         objfile:=current_module^.objfilename^;
       { Which path will be used ? }
@@ -198,11 +200,14 @@ unit og386;
          s:=current_module^.modulename^;
         case place of
           cut_begin :
-            s:=s+'h';
+            begin
+              inc(smarthcount);
+              s:=s+tostr(smarthcount)+'h';
+            end;
           cut_normal :
-            s:=s+'s';
+            s:=s+tostr(smarthcount)+'s';
           cut_end :
-            s:=s+'t';
+            s:=s+tostr(smarthcount)+'t';
         end;
         ObjFile:=Path+FixFileName(s+tostr(SmartLinkFilesCnt)+target_info.objext)
       end;
@@ -270,7 +275,10 @@ unit og386;
 end.
 {
   $Log$
-  Revision 1.14  1999-11-06 14:34:21  peter
+  Revision 1.15  1999-11-08 10:37:12  peter
+    * filename fixes for win32 imports for units with multiple needed dll's
+
+  Revision 1.14  1999/11/06 14:34:21  peter
     * truncated log to 20 revs
 
   Revision 1.13  1999/11/02 15:06:57  peter