1 files changed, 8 insertions, 80 deletions

diff --git a/cpukit/libdl/rtl-mdreloc-arm.c b/cpukit/libdl/rtl-mdreloc-arm.c
index 4950dcdab1..16efbe79da 100644
--- a/cpukit/libdl/rtl-mdreloc-arm.c
+++ b/cpukit/libdl/rtl-mdreloc-arm.c
@@ -12,14 +12,12 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unwind.h>
-#include <unwind-arm-common.h>
 
 #include <rtems/rtl/rtl.h>
 #include "rtl-elf.h"
 #include "rtl-error.h"
 #include <rtems/rtl/rtl-trace.h>
-#include "rtl-unwind.h"
+#include "rtl-unwind-arm.h"
 
 /*
  * Set to 1 to allow untested relocations. If you tested one and it
@@ -110,6 +108,12 @@ get_veneer_size(int type)
   return 8;
 }
 
+uint32_t rtems_rtl_obj_tramp_alignment (const rtems_rtl_obj* obj)
+{
+  (void) obj;
+  return sizeof(uint32_t);
+}
+
 size_t
 rtems_rtl_elf_relocate_tramp_max_size (void)
 {
@@ -528,7 +532,6 @@ rtems_rtl_elf_reloc_rel (rtems_rtl_obj*            obj,
       break;
 
     case R_TYPE(TLS_LE32):
-#if ALLOW_UNTESTED_RELOCS
       if (!parsing) {
         addend = *where;
         *where = symvalue + addend;
@@ -537,7 +540,7 @@ rtems_rtl_elf_reloc_rel (rtems_rtl_obj*            obj,
                   (void *)*where, where, rtems_rtl_obj_oname (obj));
       }
       break;
-#endif
+
     case R_TYPE(TLS_GD32):
     case R_TYPE(TLS_LDM32):
     case R_TYPE(TLS_LDO32):
@@ -597,78 +600,3 @@ rtems_rtl_elf_relocate_rel (rtems_rtl_obj*            obj,
                                   symvalue,
                                   false);
 }
-
-bool
-rtems_rtl_elf_unwind_parse (const rtems_rtl_obj* obj,
-                            const char*          name,
-                            uint32_t             flags)
-{
-  /*
-   * We location the EH sections in section flags.
-   */
-  return false;
-}
-
-bool
-rtems_rtl_elf_unwind_register (rtems_rtl_obj* obj)
-{
-  return true;
-}
-
-bool
-rtems_rtl_elf_unwind_deregister (rtems_rtl_obj* obj)
-{
-  obj->loader = NULL;
-  return true;
-}
-
-/* An exception index table entry.  */
-typedef struct __EIT_entry
-{
-  _uw fnoffset;
-  _uw content;
-} __EIT_entry;
-
-/* The exception index table location in the base module */
-extern __EIT_entry __exidx_start;
-extern __EIT_entry __exidx_end;
-
-/*
- * A weak reference is in libgcc, provide a real version and provide a way to
- * manage loaded modules.
- *
- * Passed in the return address and a reference to the number of records
- * found. We set the start of the exidx data and the number of records.
- */
-_Unwind_Ptr __gnu_Unwind_Find_exidx (_Unwind_Ptr return_address,
-                                     int*        nrec) __attribute__ ((__noinline__,
-                                                                       __used__,
-                                                                       __noclone__));
-
-_Unwind_Ptr __gnu_Unwind_Find_exidx (_Unwind_Ptr return_address,
-                                     int*        nrec)
-{
-  rtems_rtl_data*   rtl;
-  rtems_chain_node* node;
-  __EIT_entry*      exidx_start = &__exidx_start;
-  __EIT_entry*      exidx_end = &__exidx_end;
-
-  rtl = rtems_rtl_lock ();
-
-  node = rtems_chain_first (&rtl->objects);
-  while (!rtems_chain_is_tail (&rtl->objects, node)) {
-    rtems_rtl_obj* obj = (rtems_rtl_obj*) node;
-    if (rtems_rtl_obj_text_inside (obj, (void*) return_address)) {
-      exidx_start = (__EIT_entry*) obj->eh_base;
-      exidx_end = (__EIT_entry*) (obj->eh_base + obj->eh_size);
-      break;
-    }
-    node = rtems_chain_next (node);
-  }
-
-  rtems_rtl_unlock ();
-
-  *nrec = exidx_end - exidx_start;
-
-  return (_Unwind_Ptr) exidx_start;
-}