瀏覽代碼

* fixed insertion of typed constants twice in bss after r18723
for non-jvm targets (and once using a mangled name for global
variables rather than for typed constants)

git-svn-id: branches/jvmbackend@18794 -

Jonas Maebe 14 年之前
父節點
當前提交
1d2748fa69
共有 2 個文件被更改,包括 1 次插入1 次删除
  1. 1 0
      compiler/pdecvar.pas
  2. 0 1
      compiler/symcreat.pas

+ 1 - 0
compiler/pdecvar.pas

@@ -1762,6 +1762,7 @@ implementation
                      fieldvs:=tfieldvarsym(sc[i]);
                      fieldvs:=tfieldvarsym(sc[i]);
                      fieldvs.visibility:=visibility;
                      fieldvs.visibility:=visibility;
                      hstaticvs:=make_field_static(recst,fieldvs);
                      hstaticvs:=make_field_static(recst,fieldvs);
+                     cnodeutils.insertbssdata(hstaticvs);
                      if vd_final in options then
                      if vd_final in options then
                        hstaticvs.varspez:=vs_final;
                        hstaticvs.varspez:=vs_final;
                    end;
                    end;

+ 0 - 1
compiler/symcreat.pas

@@ -1165,7 +1165,6 @@ implementation
 {$else jvm}
 {$else jvm}
       include(hstaticvs.symoptions,sp_internal);
       include(hstaticvs.symoptions,sp_internal);
       tabstractrecordsymtable(recst).get_unit_symtable.insert(hstaticvs);
       tabstractrecordsymtable(recst).get_unit_symtable.insert(hstaticvs);
-      cnodeutils.insertbssdata(hstaticvs);
 {$endif jvm}
 {$endif jvm}
       { generate the symbol for the access }
       { generate the symbol for the access }
       sl:=tpropaccesslist.create;
       sl:=tpropaccesslist.create;