From fdc0e1ec41ce7b4ac213c8a5a44891f446c6aec9 Mon Sep 17 00:00:00 2001
From: James Benton <james.benton2@gmail.com>
Date: Mon, 28 Dec 2015 06:18:08 -0800
Subject: [PATCH] Merge .rplTramp.text into .text section

---
 rules/rpl.ld | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/rules/rpl.ld b/rules/rpl.ld
index 19f8406..97b7dd0 100644
--- a/rules/rpl.ld
+++ b/rules/rpl.ld
@@ -23,25 +23,9 @@ SECTIONS {
    /* Standard code section */
    .text ALIGN(32) : {
       *(.text .stub .text.*)
-   } : hdr_text
-
-   /*
-    * Trampolines for each RPL function, have the same symbol name of
-    * than the function they should import.
-    *
-    * There will be 2 relocations in each trampoline pointing to the
-    * function stub inside the .data.rplFuncStubs, we can edit these
-    * relocation entries to use the RPL import during conversion to RPL.
-    *
-    *   li    r0, func_stub@lo -> .data.rplFuncStubs
-    *   oris  r0, func_stub@hi -> .data.rplFuncStubs
-    *   mtctr r0
-    *   bctr
-    */
-   .rplTramp.text ALIGN(32) : {
       *(.rplTramp.text)
       *(SORT(.rplTramp.text.*))
-   }
+   } : hdr_text
 
    /* System stuff is for our elf2rpl converter to go through */
    . = ORIGIN(system);