paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-10 19:45:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ Basic executable stack support in TExeOutput.

Browse Source 
+ Two stubs (TExeOutput.Load_DynamicObject and TObjInput.CanReadObjData) to override in ELF linker.
+ Stop linking if errors were detected while loading object files.
* Changed TStaticLibrary to TObject. It is never looked up by name, so hashing is redundant; moreover its name has been changed to TCmdStr, which may be trimmed by TFPHashList. 

git-svn-id: trunk@21968 -
This commit is contained in:
sergei 2012-07-25 11:08:54 +00:00
parent 8703a15a83
commit 31d004e056
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/link.pas
View File

@ -93,7 +93,7 @@ interface
FCExeOutput : TExeOutputClass;
FCObjInput : TObjInputClass;
{ Libraries }
FStaticLibraryList : TFPHashObjectList;
FStaticLibraryList : TFPObjectList;
FImportLibraryList : TFPHashObjectList;
procedure Load_ReadObject(const para:TCmdStr);
procedure Load_ReadStaticLibrary(const para:TCmdStr);
@ -112,7 +112,7 @@ interface
IsHandled : PBooleanArray;
property CObjInput:TObjInputClass read FCObjInput write FCObjInput;
property CExeOutput:TExeOutputClass read FCExeOutput write FCExeOutput;
property StaticLibraryList:TFPHashObjectList read FStaticLibraryList;
property StaticLibraryList:TFPObjectList read FStaticLibraryList;
property ImportLibraryList:TFPHashObjectList read FImportLibraryList;
procedure DefaultLinkScript;virtual;abstract;
procedure ScriptAddGenericSections(secnames:string);
@ -848,7 +848,7 @@ Implementation
begin
inherited Create;
linkscript:=TCmdStrList.Create;
FStaticLibraryList:=TFPHashObjectList.Create(true);
FStaticLibraryList:=TFPObjectList.Create(true);
FImportLibraryList:=TFPHashObjectList.Create(true);
exemap:=nil;
exeoutput:=nil;
@ -960,7 +960,7 @@ Implementation
exit;
Comment(V_Tried,'Opening library '+para);
objreader:=TArObjectreader.create(para);
TStaticLibrary.Create(StaticLibraryList,para,objreader,CObjInput);
StaticLibraryList.Add(TStaticLibrary.Create(para,objreader,CObjInput));
end;
@ -1276,6 +1276,8 @@ Implementation
ParseScript_Handle;
{ Load .o files and resolve symbols }
ParseScript_Load;
if ErrorCount>0 then
goto myexit;
exeoutput.ResolveSymbols(StaticLibraryList);
{ Generate symbols and code to do the importing }
exeoutput.GenerateLibraryImports(ImportLibraryList);

29
compiler/ogbase.pas
View File

@ -240,6 +240,7 @@ interface
property CObjSection:TObjSectionClass read FCObjSection write FCObjSection;
public
CurrPass : byte;
ExecStack : boolean;
constructor create(const n:string);virtual;
destructor destroy;override;
{ Sections }
@ -312,6 +313,7 @@ interface
destructor destroy;override;
function newObjData(const n:string):TObjData;
function ReadObjData(AReader:TObjectreader;Data:TObjData):boolean;virtual;abstract;
class function CanReadObjData(AReader:TObjectreader):boolean;virtual;
procedure inputerror(const s : string);
end;
TObjInputClass=class of TObjInput;
@ -368,12 +370,13 @@ interface
end;
TExeSectionClass=class of TExeSection;
TStaticLibrary = class(TFPHashObject)
TStaticLibrary = class(TObject)
private
FName : TCmdStr;
FArReader : TObjectReader;
FObjInputClass : TObjInputClass;
public
constructor create(AList:TFPHashObjectList;const AName:string;AReader:TObjectReader;AObjInputClass:TObjInputClass);
constructor create(const AName:TCmdStr;AReader:TObjectReader;AObjInputClass:TObjInputClass);
destructor destroy;override;
property ArReader:TObjectReader read FArReader;
property ObjInputClass:TObjInputClass read FObjInputClass;
@ -444,6 +447,7 @@ interface
CurrDataPos : aword;
MaxMemPos : qword;
IsSharedLibrary : boolean;
ExecStack : boolean;
constructor create;virtual;
destructor destroy;override;
function FindExeSection(const aname:string):TExeSection;
@ -454,6 +458,7 @@ interface
procedure Load_ProvideSymbol(const aname:string);virtual;
procedure Load_IsSharedLibrary;
procedure Load_ImageBase(const avalue:string);
procedure Load_DynamicObject(ObjData:TObjData);virtual;
procedure Order_Start;virtual;
procedure Order_End;virtual;
procedure Order_ExeSection(const aname:string);virtual;
@ -477,7 +482,7 @@ interface
procedure DataPos_Symbols;virtual;
procedure BuildVTableTree(VTInheritList,VTEntryList:TFPObjectList);
procedure PackUnresolvedExeSymbols(const s:string);
procedure ResolveSymbols(StaticLibraryList:TFPHashObjectList);
procedure ResolveSymbols(StaticLibraryList:TFPObjectList);
procedure PrintMemoryMap;
procedure FixupSymbols;
procedure FixupRelocations;
@ -1456,9 +1461,9 @@ implementation
TStaticLibrary
****************************************************************************}
constructor TStaticLibrary.create(AList:TFPHashObjectList;const AName:string;AReader:TObjectReader;AObjInputClass:TObjInputClass);
constructor TStaticLibrary.create(const AName:TCmdStr;AReader:TObjectReader;AObjInputClass:TObjInputClass);
begin
inherited create(AList,AName);
FName:=AName;
FArReader:=AReader;
FObjInputClass:=AObjInputClass;
end;
@ -1595,6 +1600,7 @@ implementation
if ObjData.classtype<>FCObjData then
Comment(V_Error,'Invalid input object format for '+ObjData.name+' got '+ObjData.classname+' expected '+FCObjData.classname);
ObjDataList.Add(ObjData);
ExecStack:=ExecStack or ObjData.ExecStack;
end;
@ -1660,6 +1666,11 @@ implementation
end;
procedure TExeOutput.Load_DynamicObject(ObjData:TObjData);
begin
end;
procedure TExeOutput.Order_Start;
begin
end;
@ -2079,7 +2090,7 @@ implementation
end;
procedure TExeOutput.ResolveSymbols(StaticLibraryList:TFPHashObjectList);
procedure TExeOutput.ResolveSymbols(StaticLibraryList:TFPObjectList);
var
ObjData : TObjData;
exesym : TExeSymbol;
@ -2987,6 +2998,12 @@ implementation
end;
class function TObjInput.CanReadObjData(AReader:TObjectReader):boolean;
begin
result:=false;
end;
procedure TObjInput.ReadSectionContent(Data:TObjData);
var
i: longint;