浏览代码

* it must be decided in allocate_tls_register if a tls register is allocated

git-svn-id: trunk@43131 -
florian 5 年之前
父节点
当前提交
7ee889d4ec
共有 1 个文件被更改,包括 2 次插入3 次删除
  1. 2 3
      compiler/psub.pas

+ 2 - 3
compiler/psub.pas

@@ -1696,8 +1696,8 @@ implementation
             { allocate got register if needed }
             { allocate got register if needed }
             allocate_got_register(aktproccode);
             allocate_got_register(aktproccode);
 
 
-            if pi_uses_threadvar in flags then
-              allocate_tls_register(aktproccode);
+            { allocate got register if needed }
+            allocate_tls_register(aktproccode);
 
 
             { Allocate space in temp/registers for parast and localst }
             { Allocate space in temp/registers for parast and localst }
             current_filepos:=entrypos;
             current_filepos:=entrypos;
@@ -1854,7 +1854,6 @@ implementation
             cg.g_maybe_tls_init(templist);
             cg.g_maybe_tls_init(templist);
             aktproccode.insertlistafter(stackcheck_asmnode.currenttai,templist);
             aktproccode.insertlistafter(stackcheck_asmnode.currenttai,templist);
 
 
-
             { re-enable if more code at the end is ever generated here
             { re-enable if more code at the end is ever generated here
             cg.set_regalloc_live_range_direction(rad_forward);
             cg.set_regalloc_live_range_direction(rad_forward);
             }
             }