paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-11 16:48:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

* write nil instead of a reference to _objc_empty_vtable for iOS and the

Browse Source 
iOS simulator (based on clang source)

git-svn-id: trunk@32182 -
This commit is contained in:
Jonas Maebe 2015-10-28 21:00:57 +00:00
parent 56a4051296
commit 9ffadf2941
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/objcgutl.pas
View File

@ -1493,9 +1493,10 @@ procedure tobjcrttiwriter_nonfragile.gen_objc_classes_sections(list:TAsmList; ob
ObjCEmptyCacheVar:=current_asmdata.RefAsmSymbol(target_info.Cprefix+'_objc_empty_cache');
list.Concat(Tai_const.Create_sym(ObjCEmptyCacheVar));
{ pointer to vtable }
if not assigned(ObjCEmptyVtableVar) then
if not assigned(ObjCEmptyVtableVar) and
not(target_info.system in [system_arm_darwin,system_aarch64_darwin,system_i386_iphonesim,system_x86_64_iphonesim]) then
ObjCEmptyVtableVar:=current_asmdata.RefAsmSymbol(target_info.Cprefix+'_objc_empty_vtable');
list.Concat(Tai_const.Create_sym(ObjCEmptyVtableVar));
ConcatSymOrNil(list,ObjCEmptyVtableVar);
{ the read-only part }
list.Concat(Tai_const.Create_sym(metarosym));
@ -1509,7 +1510,7 @@ procedure tobjcrttiwriter_nonfragile.gen_objc_classes_sections(list:TAsmList; ob
{ pointer to cache }
list.Concat(Tai_const.Create_sym(ObjCEmptyCacheVar));
{ pointer to vtable }
list.Concat(Tai_const.Create_sym(ObjCEmptyVtableVar));
ConcatSymOrNil(list,ObjCEmptyVtableVar);
{ the read-only part }
list.Concat(Tai_const.Create_sym(rosym));