Răsfoiți Sursa

* capitalize the group name 'DGROUP' in the generated omf object files, because
that's how it is usually written by other 16-bit compilers

git-svn-id: trunk@31369 -

nickysn 10 ani în urmă
părinte
comite
e09ab50724
2 a modificat fișierele cu 10 adăugiri și 10 ștergeri
  1. 6 6
      compiler/ogomf.pas
  2. 4 4
      compiler/x86/agx86nsm.pas

+ 6 - 6
compiler/ogomf.pas

@@ -243,7 +243,7 @@ implementation
 
     function TOmfRelocation.GetGroupIndex(const groupname: string): Integer;
       begin
-        if groupname='dgroup' then
+        if groupname='DGROUP' then
           Result:=1
         else
           internalerror(2014040703);
@@ -349,7 +349,7 @@ implementation
               internalerror(2015041401);
             FOmfFixup.FrameMethod:=ffmTarget;
             FOmfFixup.TargetMethod:=ftmGroupIndexNoDisp;
-            FOmfFixup.TargetDatum:=GetGroupIndex('dgroup');
+            FOmfFixup.TargetDatum:=GetGroupIndex('DGROUP');
           end
         else
          internalerror(2015040702);
@@ -424,7 +424,7 @@ implementation
             dgroup:=true;
           end;
         if dgroup then
-          FPrimaryGroup:='dgroup'
+          FPrimaryGroup:='DGROUP'
         else
           FPrimaryGroup:='';
       end;
@@ -922,16 +922,16 @@ implementation
             AddSegment(Name,ClassName,OverlayName,OmfAlignment,Combination,Use,Size);
 
 
-        { create group "dgroup" }
+        { create group "DGROUP" }
         SetLength(DGroupSegments,0);
         for i:=0 to Data.ObjSectionList.Count-1 do
           with TOmfObjSection(Data.ObjSectionList[I]) do
-            if PrimaryGroup='dgroup' then
+            if PrimaryGroup='DGROUP' then
               begin
                 SetLength(DGroupSegments,Length(DGroupSegments)+1);
                 DGroupSegments[High(DGroupSegments)]:=index;
               end;
-        AddGroup('dgroup',DGroupSegments);
+        AddGroup('DGROUP',DGroupSegments);
 
         { write LNAMES record(s) }
         LNamesRec:=TOmfRecord_LNAMES.Create;

+ 4 - 4
compiler/x86/agx86nsm.pas

@@ -370,7 +370,7 @@ interface
 {$ifdef i8086}
               else if o.ref^.refaddr=addr_dgroup then
                 begin
-                  AsmWrite('dgroup');
+                  AsmWrite('DGROUP');
                 end
 {$endif i8086}
               else
@@ -1093,11 +1093,11 @@ interface
         AsmWriteLn('SECTION heap class=heap align=16');
       { group these sections in the same segment }
       if current_settings.x86memorymodel=mm_tiny then
-        AsmWriteLn('GROUP dgroup text rodata data fpc bss heap')
+        AsmWriteLn('GROUP DGROUP text rodata data fpc bss heap')
       else if current_settings.x86memorymodel in x86_near_data_models then
-        AsmWriteLn('GROUP dgroup rodata data fpc bss stack heap')
+        AsmWriteLn('GROUP DGROUP rodata data fpc bss stack heap')
       else
-        AsmWriteLn('GROUP dgroup rodata data fpc bss');
+        AsmWriteLn('GROUP DGROUP rodata data fpc bss');
       if paratargetdbg in [dbg_dwarf2,dbg_dwarf3,dbg_dwarf4] then
         begin
           AsmWriteLn('SECTION .debug_frame  use32 class=DWARF align=4');