浏览代码

* make the string data of p(wide)char string constants local (except when
using library-based smartlinking), as it is not exported

git-svn-id: branches/hlcgllvm@28167 -

Jonas Maebe 11 年之前
父节点
当前提交
063d50b4c9
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      compiler/ngtcon.pas

+ 2 - 2
compiler/ngtcon.pas

@@ -835,7 +835,7 @@ function get_next_varsym(def: tabstractrecorddef; const SymList:TFPHashObjectLis
               { create a tcb for the string data (it's placed in a separate
                 asmlist) }
               datatcb:=ctai_typedconstbuilder.create;
-              current_asmdata.getdatalabel(ll);
+              current_asmdata.getlabel(ll,alt_data);
               if node.nodetype=stringconstn then
                 varalign:=size_2_align(tstringconstnode(node).len)
               else
@@ -886,7 +886,7 @@ function get_next_varsym(def: tabstractrecorddef; const SymList:TFPHashObjectLis
             begin
               if (node.nodetype in [stringconstn,ordconstn]) then
                 begin
-                  current_asmdata.getdatalabel(ll);
+                  current_asmdata.getlabel(ll,alt_data);
                   { convert to unicodestring stringconstn }
                   inserttypeconv(node,cunicodestringtype);
                   if (node.nodetype=stringconstn) and