* Big fix for ARM GOT support to make it work: - Fixed access to symbols with offset...

git-svn-id: http://svn.freepascal.org/svn/ fpc/trunk@31681 3ad0048d-3df7-0310-abae-a5850022a9f2

Gbp-Pq: Name Big-fix-for-ARM-GOT-support-to-make-it-work.patch

diff --git a/fpcsrc/compiler/aggas.pas b/fpcsrc/compiler/aggas.pas
index 8dc78294fe6503dff1e71d6c11cd95905df21b36..d1fbb2556f154e264e73b57d53e1e37506834bb4 100644 (file)
--- a/fpcsrc/compiler/aggas.pas
+++ b/fpcsrc/compiler/aggas.pas
@@ -956,6 +956,8 @@ implementation
 {$endif cpu64bitaddr}
                  aitconst_got:
                    begin
+                     if tai_const(hp).symofs<>0 then
+                       InternalError(2015091401);  // No symbol offset is allowed for GOT.
                      AsmWrite(#9'.word'#9+tai_const(hp).sym.name+'(GOT)');
                      Asmln;
                    end;

diff --git a/fpcsrc/compiler/arm/cgcpu.pas b/fpcsrc/compiler/arm/cgcpu.pas
index 3f0572510ecfee394d4106719dab441e40f99dc0..68177fe69ada94afadc05e00d813310ba49b5830 100644 (file)
--- a/fpcsrc/compiler/arm/cgcpu.pas
+++ b/fpcsrc/compiler/arm/cgcpu.pas
@@ -653,7 +653,6 @@ unit cgcpu;
         if (tf_pic_uses_got in target_info.flags) and
            (cs_create_pic in current_settings.moduleswitches) then
           begin
-            include(current_procinfo.flags,pi_needs_got);
             r.refaddr:=addr_pic
           end
         else
@@ -2061,6 +2060,12 @@ unit cgcpu;
          mmpostfix: toppostfix;
          imm1, imm2: DWord;
       begin
+        { Release PIC register }
+        if (cs_create_pic in current_settings.moduleswitches) and
+           (tf_pic_uses_got in target_info.flags) and
+           (pi_needs_got in current_procinfo.flags)
+        then
+          list.concat(tai_regalloc.dealloc(current_procinfo.got,nil));
         if not(nostackframe) then
           begin
             registerarea:=0;
@@ -2268,6 +2273,9 @@ unit cgcpu;
            (pi_needs_got in current_procinfo.flags) and
            (tf_pic_uses_got in target_info.flags) then
           begin
+            a_reg_alloc(list,current_procinfo.got);  // Alloc PIC register
+            if getsupreg(current_procinfo.got) < first_int_imreg then
+              include(rg[R_INTREGISTER].used_in_proc,getsupreg(current_procinfo.got));
             reference_reset(ref,4);
             current_asmdata.getdatalabel(l);
             cg.a_label(current_procinfo.aktlocaldata,l);
@@ -2374,12 +2382,12 @@ unit cgcpu;
               begin
                 tmpreg:=g_indirect_sym_load(list,ref.symbol.name,asmsym2indsymflags(ref.symbol));
                 if ref.offset<>0 then
-                  a_op_const_reg(list,OP_ADD,OS_ADDR,ref.offset,tmpreg);
+                    a_op_const_reg(list,OP_ADD,OS_ADDR,ref.offset,tmpreg);
                 indirection_done:=true;
               end
             else if (cs_create_pic in current_settings.moduleswitches) then
               if (tf_pic_uses_got in target_info.flags) then
-                current_procinfo.aktlocaldata.concat(tai_const.Create_type_sym_offset(aitconst_got,ref.symbol,ref.offset))
+                current_procinfo.aktlocaldata.concat(tai_const.Create_type_sym(aitconst_got,ref.symbol))
               else
                 begin
                   { ideally, we would want to generate
@@ -2403,7 +2411,7 @@ unit cgcpu;
               current_procinfo.aktlocaldata.concat(tai_const.create_sym_offset(ref.symbol,ref.offset))
           end
         else
-          current_procinfo.aktlocaldata.concat(tai_const.Create_32bit(ref.offset));
+            current_procinfo.aktlocaldata.concat(tai_const.Create_32bit(ref.offset));
 
         { load consts entry }
         if not indirection_done then
@@ -2421,6 +2429,8 @@ unit cgcpu;
                 tmpref.base:=current_procinfo.got;
                 tmpref.index:=tmpreg;
                 list.concat(taicpu.op_reg_ref(A_LDR,tmpreg,tmpref));
+                if ref.offset<>0 then
+                  a_op_const_reg(list,OP_ADD,OS_ADDR,ref.offset,tmpreg);
               end;
           end;
 

diff --git a/fpcsrc/compiler/arm/cpupi.pas b/fpcsrc/compiler/arm/cpupi.pas
index 30cd892d116f701877dfd097baa843ec4d2b25cb..3d69b85da013edd9fab82f18f928531abc604f76 100644 (file)
--- a/fpcsrc/compiler/arm/cpupi.pas
+++ b/fpcsrc/compiler/arm/cpupi.pas
@@ -265,7 +265,7 @@ unit cpupi;
       begin
         { darwin doesn't use a got }
         if tf_pic_uses_got in target_info.flags then
-          got := cg.getaddressregister(list);
+          got := NR_PIC_OFFSET_REG;
       end;