<p>Patrick Georgi <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/c/coreboot/+/29874">View Change</a></p><div style="white-space:pre-wrap">Approvals:
build bot (Jenkins): Verified
Philipp Deppenwiese: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">util/cbfstool: Support AMD64 rmodules<br><br>Add support for 64bit rmodule, as required for relocatable<br>ramstage on x86_64.<br><br>Change-Id: I7fbb3b4c0f76ce82c090b5f16f67a728b6bf94a5<br>Signed-off-by: Patrick Rudolph <siro@das-labor.org><br>Reviewed-on: https://review.coreboot.org/c/29874<br>Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com><br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>---<br>M util/cbfstool/elf.h<br>M util/cbfstool/elfheaders.c<br>M util/cbfstool/rmodule.c<br>3 files changed, 72 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/util/cbfstool/elf.h b/util/cbfstool/elf.h</span><br><span>index a0bb35d..43fd7f3 100644</span><br><span>--- a/util/cbfstool/elf.h</span><br><span>+++ b/util/cbfstool/elf.h</span><br><span>@@ -1148,6 +1148,43 @@</span><br><span> /* Keep this the last entry. */</span><br><span> #define R_386_NUM 38</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* AMD64 specific definitions. */</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_NONE 0 /* relocation types */</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_64 1</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_PC32 2</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_GOT32 3</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_PLT32 4</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_COPY 5</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_GLOB_DAT 6</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_JUMP_SLOT 7</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_RELATIVE 8</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_GOTPCREL 9</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_32 10</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_32S 11</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_16 12</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_PC16 13</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_8 14</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_PC8 15</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_DTPMOD64 16</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_DTPOFF64 17</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_TPOFF64 18</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_TLSGD 19</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_TLSLD 20</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_DTPOFF32 21</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_GOTTPOFF 22</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_TPOFF32 23</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_PC64 24</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_GOTOFF64 25</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_GOTPC32 26</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_GOT64 27 /* reserved for future expansion */</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_GOTPCREL64 28 /* reserved for future expansion */</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_GOTPC64 29 /* reserved for future expansion */</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_GOTPLT64 30 /* reserved for future expansion */</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_PLTOFF64 31 /* reserved for future expansion */</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_SIZE32 32</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_SIZE64 33</span><br><span style="color: hsl(120, 100%, 40%);">+#define R_AMD64_NUM 34</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* SUN SPARC specific definitions. */</span><br><span> </span><br><span> /* Legal values for ST_TYPE subfield of st_info (symbol type). */</span><br><span>diff --git a/util/cbfstool/elfheaders.c b/util/cbfstool/elfheaders.c</span><br><span>index 9d02c30..8da54d0 100644</span><br><span>--- a/util/cbfstool/elfheaders.c</span><br><span>+++ b/util/cbfstool/elfheaders.c</span><br><span>@@ -1072,6 +1072,9 @@</span><br><span> case EM_386:</span><br><span> type = R_386_32;</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case EM_X86_64:</span><br><span style="color: hsl(120, 100%, 40%);">+ type = R_AMD64_64;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case EM_ARM:</span><br><span> type = R_ARM_ABS32;</span><br><span> break;</span><br><span>diff --git a/util/cbfstool/rmodule.c b/util/cbfstool/rmodule.c</span><br><span>index ff8f1cd..f270e3e 100644</span><br><span>--- a/util/cbfstool/rmodule.c</span><br><span>+++ b/util/cbfstool/rmodule.c</span><br><span>@@ -44,6 +44,33 @@</span><br><span> return (type == R_386_32);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int valid_reloc_amd64(Elf64_Rela *rel)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int type;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ type = ELF64_R_TYPE(rel->r_info);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Only these 5 relocations are expected to be found. */</span><br><span style="color: hsl(120, 100%, 40%);">+ return (type == R_AMD64_64 ||</span><br><span style="color: hsl(120, 100%, 40%);">+ type == R_AMD64_PC64 ||</span><br><span style="color: hsl(120, 100%, 40%);">+ type == R_AMD64_32S ||</span><br><span style="color: hsl(120, 100%, 40%);">+ type == R_AMD64_32 ||</span><br><span style="color: hsl(120, 100%, 40%);">+ type == R_AMD64_PC32);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int should_emit_amd64(Elf64_Rela *rel)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int type;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ type = ELF64_R_TYPE(rel->r_info);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Only emit absolute relocations */</span><br><span style="color: hsl(120, 100%, 40%);">+ return (type == R_AMD64_64 ||</span><br><span style="color: hsl(120, 100%, 40%);">+ type == R_AMD64_PC64 ||</span><br><span style="color: hsl(120, 100%, 40%);">+ type == R_AMD64_32S ||</span><br><span style="color: hsl(120, 100%, 40%);">+ type == R_AMD64_32);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int valid_reloc_arm(Elf64_Rela *rel)</span><br><span> {</span><br><span> int type;</span><br><span>@@ -101,6 +128,11 @@</span><br><span> .should_emit = should_emit_386,</span><br><span> },</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ .arch = EM_X86_64,</span><br><span style="color: hsl(120, 100%, 40%);">+ .valid_type = valid_reloc_amd64,</span><br><span style="color: hsl(120, 100%, 40%);">+ .should_emit = should_emit_amd64,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span> .arch = EM_ARM,</span><br><span> .valid_type = valid_reloc_arm,</span><br><span> .should_emit = should_emit_arm,</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/29874">change 29874</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/c/coreboot/+/29874"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I7fbb3b4c0f76ce82c090b5f16f67a728b6bf94a5 </div>
<div style="display:none"> Gerrit-Change-Number: 29874 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <siro@das-labor.org> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>