diff options
| author | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2013-09-06 10:09:26 +0000 |
|---|---|---|
| committer | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2013-09-06 10:09:26 +0000 |
| commit | b379f2cb9ef71d09216f34380bf3a4dba6777782 (patch) | |
| tree | 16d28b20151c20bd514b097c7c0016adaff2bfda /compiler/ncgrtti.pas | |
| parent | 71c0dea92bdcc6a331d86adc4107d6f9bbd92c02 (diff) | |
| parent | e259a09cecfcf724f8e49010f0db5dadb8a3e2c3 (diff) | |
| download | fpc-b379f2cb9ef71d09216f34380bf3a4dba6777782.tar.gz | |
* synchronized with trunk up to and including r25430cpstrrtl
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/cpstrrtl@25431 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'compiler/ncgrtti.pas')
| -rw-r--r-- | compiler/ncgrtti.pas | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/compiler/ncgrtti.pas b/compiler/ncgrtti.pas index a100f54f24..41b56f78a3 100644 --- a/compiler/ncgrtti.pas +++ b/compiler/ncgrtti.pas @@ -343,7 +343,7 @@ implementation if not(po_virtualmethod in tprocdef(propaccesslist.procdef).procoptions) or is_objectpascal_helper(tprocdef(propaccesslist.procdef).struct) then begin - current_asmdata.asmlists[al_rtti].concat(Tai_const.createname(tprocdef(propaccesslist.procdef).mangledname,0)); + current_asmdata.asmlists[al_rtti].concat(Tai_const.createname(tprocdef(propaccesslist.procdef).mangledname,AT_FUNCTION,0)); typvalue:=1; end else @@ -857,7 +857,7 @@ implementation if not is_objectpascal_helper(def) then if (oo_has_vmt in def.objectoptions) then - current_asmdata.asmlists[al_rtti].concat(Tai_const.Createname(def.vmt_mangledname,0)) + current_asmdata.asmlists[al_rtti].concat(Tai_const.Createname(def.vmt_mangledname,AT_DATA,0)) else current_asmdata.asmlists[al_rtti].concat(Tai_const.Create_nil_dataptr); @@ -1307,7 +1307,7 @@ implementation function TRTTIWriter.ref_rtti(def:tdef;rt:trttitype):tasmsymbol; begin - result:=current_asmdata.RefAsmSymbol(def.rtti_mangledname(rt)); + result:=current_asmdata.RefAsmSymbol(def.rtti_mangledname(rt),AT_DATA); if (cs_create_pic in current_settings.moduleswitches) and assigned(current_procinfo) then include(current_procinfo.flags,pi_needs_got); @@ -1343,7 +1343,7 @@ implementation function TRTTIWriter.get_rtti_label(def:tdef;rt:trttitype):tasmsymbol; begin - result:=current_asmdata.RefAsmSymbol(def.rtti_mangledname(rt)); + result:=current_asmdata.RefAsmSymbol(def.rtti_mangledname(rt),AT_DATA); if (cs_create_pic in current_settings.moduleswitches) and assigned(current_procinfo) then include(current_procinfo.flags,pi_needs_got); @@ -1351,7 +1351,7 @@ implementation function TRTTIWriter.get_rtti_label_ord2str(def:tdef;rt:trttitype):tasmsymbol; begin - result:=current_asmdata.RefAsmSymbol(def.rtti_mangledname(rt)+'_o2s'); + result:=current_asmdata.RefAsmSymbol(def.rtti_mangledname(rt)+'_o2s',AT_DATA); if (cs_create_pic in current_settings.moduleswitches) and assigned(current_procinfo) then include(current_procinfo.flags,pi_needs_got); @@ -1359,7 +1359,7 @@ implementation function TRTTIWriter.get_rtti_label_str2ord(def:tdef;rt:trttitype):tasmsymbol; begin - result:=current_asmdata.RefAsmSymbol(def.rtti_mangledname(rt)+'_s2o'); + result:=current_asmdata.RefAsmSymbol(def.rtti_mangledname(rt)+'_s2o',AT_DATA); if (cs_create_pic in current_settings.moduleswitches) and assigned(current_procinfo) then include(current_procinfo.flags,pi_needs_got); |