diff options
| author | nickysn <nickysn@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2019-06-14 22:24:19 +0000 |
|---|---|---|
| committer | nickysn <nickysn@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2019-06-14 22:24:19 +0000 |
| commit | 5dfffcda5167f65ffd1c97dcfa7dd1bd77f6ccbb (patch) | |
| tree | 7bd63b8592c8742c6ae28a0b4c8cb6033c9560fa | |
| parent | c4004469901c7e2dff694cd9815f143e047643a3 (diff) | |
| download | fpc-5dfffcda5167f65ffd1c97dcfa7dd1bd77f6ccbb.tar.gz | |
- remove the tiny memory model code from TInternalLinkerWin16.DefaultLinkScript,
because the Win16 target doesn't support the tiny memory model
git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@42229 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | compiler/systems/t_win16.pas | 39 |
1 files changed, 14 insertions, 25 deletions
diff --git a/compiler/systems/t_win16.pas b/compiler/systems/t_win16.pas index b687e6ee8e..0ff80961be 100644 --- a/compiler/systems/t_win16.pas +++ b/compiler/systems/t_win16.pas @@ -331,12 +331,13 @@ var begin { add objectfiles, start with prt0 always } case current_settings.x86memorymodel of - mm_tiny: LinkScript.Concat('READOBJECT ' + maybequoted(FindObjectFile('prt0t','',false))); mm_small: LinkScript.Concat('READOBJECT ' + maybequoted(FindObjectFile('prt0s','',false))); mm_medium: LinkScript.Concat('READOBJECT ' + maybequoted(FindObjectFile('prt0m','',false))); mm_compact: LinkScript.Concat('READOBJECT ' + maybequoted(FindObjectFile('prt0c','',false))); mm_large: LinkScript.Concat('READOBJECT ' + maybequoted(FindObjectFile('prt0l','',false))); mm_huge: LinkScript.Concat('READOBJECT ' + maybequoted(FindObjectFile('prt0h','',false))); + else + internalerror(2019061501); end; while not ObjectFiles.Empty do begin @@ -354,30 +355,18 @@ begin LinkScript.Concat('ENDGROUP'); LinkScript.Concat('EXESECTION .MZ_flat_content'); - if current_settings.x86memorymodel=mm_tiny then - begin - LinkScript.Concat(' OBJSECTION _TEXT||CODE'); - LinkScript.Concat(' OBJSECTION *||CODE'); - LinkScript.Concat(' OBJSECTION *||DATA'); - LinkScript.Concat(' SYMBOL _edata'); - LinkScript.Concat(' OBJSECTION *||BSS'); - LinkScript.Concat(' SYMBOL _end'); - end - else - begin - LinkScript.Concat(' OBJSECTION _TEXT||CODE'); - LinkScript.Concat(' OBJSECTION *||CODE'); - LinkScript.Concat(' OBJSECTION *||FAR_DATA'); - LinkScript.Concat(' OBJSECTION _NULL||BEGDATA'); - LinkScript.Concat(' OBJSECTION _AFTERNULL||BEGDATA'); - LinkScript.Concat(' OBJSECTION *||BEGDATA'); - LinkScript.Concat(' OBJSECTION *||DATA'); - LinkScript.Concat(' SYMBOL _edata'); - LinkScript.Concat(' OBJSECTION *||BSS'); - LinkScript.Concat(' SYMBOL _end'); - LinkScript.Concat(' OBJSECTION *||STACK'); - LinkScript.Concat(' OBJSECTION *||HEAP'); - end; + LinkScript.Concat(' OBJSECTION _TEXT||CODE'); + LinkScript.Concat(' OBJSECTION *||CODE'); + LinkScript.Concat(' OBJSECTION *||FAR_DATA'); + LinkScript.Concat(' OBJSECTION _NULL||BEGDATA'); + LinkScript.Concat(' OBJSECTION _AFTERNULL||BEGDATA'); + LinkScript.Concat(' OBJSECTION *||BEGDATA'); + LinkScript.Concat(' OBJSECTION *||DATA'); + LinkScript.Concat(' SYMBOL _edata'); + LinkScript.Concat(' OBJSECTION *||BSS'); + LinkScript.Concat(' SYMBOL _end'); + LinkScript.Concat(' OBJSECTION *||STACK'); + LinkScript.Concat(' OBJSECTION *||HEAP'); LinkScript.Concat('ENDEXESECTION'); if (cs_debuginfo in current_settings.moduleswitches) and |