From f98abbe0ebed3787b30236b370538956c9c695ca Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Thu, 6 Nov 2014 13:08:48 +1100 Subject: libdl: Disable building libdl for the NIOS2. No relocation support. This should have been added. --- cpukit/configure.ac | 2 +- cpukit/libdl/rtl-mdreloc-nios2.c | 44 ---------------------------------------- testsuites/libtests/configure.ac | 2 +- 3 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 cpukit/libdl/rtl-mdreloc-nios2.c diff --git a/cpukit/configure.ac b/cpukit/configure.ac index b3c818c861..d5b6eb377a 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -377,7 +377,7 @@ AM_CONDITIONAL([RPCTOOLS],[test "$RPCGEN" = rpcgen \ AC_MSG_CHECKING([whether CPU supports libdl]) case $RTEMS_CPU in arm | bfin | h8300 | i386 | lm32 | m32r | m68k | mips | \ - moxie | nios2 | powerpc | sparc | v850) + moxie | powerpc | sparc | v850) HAVE_LIBDL=yes ;; *) HAVE_LIBDL=no ;; diff --git a/cpukit/libdl/rtl-mdreloc-nios2.c b/cpukit/libdl/rtl-mdreloc-nios2.c deleted file mode 100644 index 4f63f07f98..0000000000 --- a/cpukit/libdl/rtl-mdreloc-nios2.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Taken from NetBSD and stripped of the relocations not needed on RTEMS. - */ - -/* $NetBSD: mdreloc.c,v 1.26 2010/01/14 11:58:32 skrll Exp $ */ - -#include - -#include -#include -#include -#include - -#include -#include "rtl-elf.h" -#include "rtl-error.h" -#include "rtl-trace.h" - -bool -rtems_rtl_elf_rel_resolve_sym (Elf_Word type) -{ - return true; -} - - -bool -rtems_rtl_elf_relocate_rela (rtems_rtl_obj_t* obj, - const Elf_Rela* rela, - rtems_rtl_obj_sect_t* sect, - Elf_Word symvalue) -{ - - return true; -} - -bool -rtems_rtl_elf_relocate_rel (rtems_rtl_obj_t* obj, - const Elf_Rel* rel, - rtems_rtl_obj_sect_t* sect, - Elf_Word symvalue) -{ - printf ("rtl: rel type record not supported; please report\n"); - return false; -} diff --git a/testsuites/libtests/configure.ac b/testsuites/libtests/configure.ac index 392e2a9ec0..7d4871d447 100644 --- a/testsuites/libtests/configure.ac +++ b/testsuites/libtests/configure.ac @@ -45,7 +45,7 @@ AM_CONDITIONAL(HAS_POSIX,test x"${rtems_cv_RTEMS_POSIX_API}" = x"yes") AC_MSG_CHECKING([whether CPU supports libdl]) case $RTEMS_CPU in arm | bfin | h8300 | i386 | lm32 | m32r | m68k | mips | \ - moxie | nios2 | powerpc | sparc | v850) + moxie | powerpc | sparc | v850) HAVE_LIBDL=yes ;; *) HAVE_LIBDL=no ;; -- cgit v1.2.3