Fixed layout problem

Fixed when only one elf object file is passed to rtems-ld.And fixed the error when
one object file has rela relocation records, but the other does not contain relocation
records.

Signed-off-by: Peng Fan <van.freenix@gmail.com>

1 files changed, 12 insertions, 1 deletions

diff --git a/linkers/rld-rap.cpp b/linkers/rld-rap.cpp
index 8b3bbcb..590d31e 100644
--- a/linkers/rld-rap.cpp
+++ b/linkers/rld-rap.cpp
@@ -882,10 +882,21 @@ namespace rld
             obj.secs[s].set_offset (pobj.secs[s]);
             sec_size[s] = obj.secs[s].offset + obj.secs[s].size ();
             sec_align[s] = obj.secs[s].alignment ();
-            sec_rela[s] = obj.secs[s].rela;
+            if (obj.secs[s].rela == true)
+              sec_rela[s] = obj.secs[s].rela;
           }
           ++poi;
         }
+        else
+        {
+          for (int s = 0; s < rap_secs; ++s)
+          {
+            sec_size[s] =  obj.secs[s].size ();
+            sec_align[s] = obj.secs[s].alignment ();
+            if (obj.secs[s].rela == true)
+              sec_rela[s] = true;
+          }
+        }
 
         collect_symbols (obj);