diff --git a/backends/Makefile.am b/backends/Makefile.am

index 9d34042..3d85cde 100644

--- a/backends/Makefile.am

+++ b/backends/Makefile.am

@@ -41,12 +41,38 @@ libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a    \

 	     libebl_m68k_pic.a libebl_bpf_pic.a libebl_riscv_pic.a

 noinst_LIBRARIES = $(libebl_pic)

 noinst_DATA = $(libebl_pic:_pic.a=.so)

+lib_LIBRARIES = libebl_static_pic.a

 libelf = ../libelf/libelf.so

 libdw = ../libdw/libdw.so

 libeu = ../lib/libeu.a

+# The following is minimal set of backends that we link with libdw to

+# avoid dlopen. Note repeats files below because some backends reuse

+# each others files.

+static_SRCS = i386_init.c i386_symbol.c i386_corenote.c i386_cfi.c \

+	     i386_retval.c i386_regs.c i386_auxv.c i386_syscall.c \

+	     i386_initreg.c i386_unwind.c \

+	     x86_64_init.c x86_64_symbol.c x86_64_corenote.c x86_64_cfi.c \

+	     x86_64_retval.c x86_64_regs.c x86_64_syscall.c \

+	     x86_64_initreg.c x86_64_unwind.c x32_corenote.c \

+	     ia64_init.c ia64_symbol.c ia64_regs.c ia64_retval.c \

+	     aarch64_init.c aarch64_regs.c aarch64_symbol.c   \

+	     aarch64_corenote.c aarch64_retval.c aarch64_cfi.c \

+	     aarch64_initreg.c aarch64_unwind.c \

+	     ppc_init.c ppc_symbol.c ppc_retval.c ppc_regs.c \

+	     ppc_corenote.c ppc_auxv.c ppc_attrs.c ppc_syscall.c \

+	     ppc_cfi.c ppc_initreg.c \

+	     ppc64_init.c ppc64_symbol.c ppc64_retval.c ppc64_corenote.c \

+	     ppc64_resolve_sym.c ppc64_unwind.c \

+	     s390_init.c s390_symbol.c s390_regs.c s390_retval.c \

+	     s390_corenote.c s390x_corenote.c s390_cfi.c s390_initreg.c \

+	     s390_unwind.c bpf_init.c bpf_regs.c bpf_symbol.c

+

+libebl_static_pic_a_SOURCES = $(static_SRCS)

+am_libebl_static_pic_a_OBJECTS = $(static_SRCS:.c=.os)

+

 i386_SRCS = i386_init.c i386_symbol.c i386_corenote.c i386_cfi.c \

 	    i386_retval.c i386_regs.c i386_auxv.c i386_syscall.c \

 	    i386_initreg.c i386_unwind.c

diff --git a/configure.ac b/configure.ac

index da9f8cb..9decd61 100644

--- a/configure.ac

+++ b/configure.ac

@@ -25,6 +25,12 @@ m4_ifndef([AC_PACKAGE_URL],

                     [Define to home page for this package])

           AC_SUBST([PACKAGE_URL], ["http://elfutils.org/"])])

+dnl Workaround for older autoconf < 2.64

+m4_ifndef([AC_PACKAGE_URL],

+         [AC_DEFINE([PACKAGE_URL], ["http://elfutils.org/"],

+                    [Define to home page for this package])

+          AC_SUBST([PACKAGE_URL], ["http://elfutils.org/"])])

+

 # We want eu- as default program prefix if none was given by the user.

 # But if the user explicitly provided --program-prefix="" then pretend

 # it wasn't set at all (NONE). We want to test this really early before

diff --git a/libasm/Makefile.am b/libasm/Makefile.am

index 19fef50..fcc7ffc 100644

--- a/libasm/Makefile.am

+++ b/libasm/Makefile.am

@@ -38,6 +38,7 @@ noinst_LIBRARIES = libasm_pic.a

 noinst_PROGRAMS = $(noinst_LIBRARIES:_pic.a=.so)

 pkginclude_HEADERS = libasm.h

+libasm_a_CFLAGS = -fPIC -fvisibility=hidden $(AM_CFLAGS)

 libasm_a_SOURCES = asm_begin.c asm_abort.c asm_end.c asm_error.c \

 		   asm_getelf.c asm_newscn.c asm_newscn_ingrp.c \

 		   asm_newsubscn.c asm_newsym.c asm_newcomsym.c \

diff --git a/libcpu/Makefile.am b/libcpu/Makefile.am

index 4c8778d..f0a1cb8 100644

--- a/libcpu/Makefile.am

+++ b/libcpu/Makefile.am

@@ -36,9 +36,11 @@ LEX_OUTPUT_ROOT = lex.$(

 AM_YFLAGS = -p$(

 noinst_LIBRARIES = libcpu_i386.a libcpu_x86_64.a

+lib_LIBRARIES = libcpu_static_pic.a

 libcpu_i386_a_SOURCES = i386_disasm.c i386_dis.h

 libcpu_x86_64_a_SOURCES = x86_64_disasm.c x86_64_dis.h

+libcpu_static_pic_a_SOURCES = $(libcpu_i386_a_SOURCES) $(libcpu_x86_64_a_SOURCES)

 i386_gendis_SOURCES = i386_gendis.c i386_lex.l i386_parse.y

@@ -48,6 +50,8 @@ x86_64_disasm.o: x86_64.mnemonics $(srcdir)/x86_64_dis.h

 noinst_LIBRARIES += libcpu_bpf.a

 libcpu_bpf_a_SOURCES = bpf_disasm.c

 libcpu_bpf_a_CFLAGS = $(AM_CFLAGS) -Wno-format-nonliteral

+libcpu_static_pic_a_SOURCES += $(libcpu_bpf_a_SOURCES)

+bpf_disasm_CFLAGS = -fPIC -Wno-format-nonliteral

 %_defs: $(srcdir)/defs/i386

 	$(AM_V_GEN)m4 -D$* -DDISASSEMBLER $< > $@T

diff --git a/libdw/Makefile.am b/libdw/Makefile.am

index 7a3d532..166e37c 100644

--- a/libdw/Makefile.am

+++ b/libdw/Makefile.am

@@ -35,12 +35,13 @@ AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(srcdir)/../libdwelf

 VERSION = 1

 lib_LIBRARIES = libdw.a

-noinst_LIBRARIES = libdw_pic.a

-noinst_PROGRAMS = $(noinst_LIBRARIES:_pic.a=.so)

+noinst_LIBRARIES = libdw_pic.a libdw_static_pic.a

+noinst_PROGRAMS = libdw.so

 include_HEADERS = dwarf.h

 pkginclude_HEADERS = libdw.h known-dwarf.h

+libdw_a_CFLAGS = -fPIC -fvisibility=hidden $(AM_CFLAGS)

 libdw_a_SOURCES = dwarf_begin.c dwarf_begin_elf.c dwarf_end.c dwarf_getelf.c \

 		  dwarf_getpubnames.c dwarf_getabbrev.c dwarf_tag.c \

 		  dwarf_error.c dwarf_nextcu.c dwarf_diename.c dwarf_offdie.c \

@@ -94,6 +95,25 @@ libdw_a_SOURCES = dwarf_begin.c dwarf_begin_elf.c dwarf_end.c dwarf_getelf.c \

 		  libdw_find_split_unit.c dwarf_cu_info.c \

 		  dwarf_next_lines.c

+# Minimal library with symbols needed by those libebl backends that we

+# ship statically.  This is so that e.g. strip doesn't end up bringing

+# in the whole of libdw, and depending on libbz2, liblzma, etc.

+libdw_static_pic_a_SOURCES = libdw_form.c dwarf_child.c dwarf_attr.c \

+		dwarf_attr_integrate.c dwarf_formref_die.c dwarf_error.c \

+		dwarf_tag.c dwarf_formref.c \

+		dwarf_abbrev_hash.c dwarf_sig8_hash.c \

+		dwarf_formudata.c libdw_findcu.c dwarf_offdie.c \

+		dwarf_getabbrev.c dwarf_nextcu.c libdw_alloc.c \

+		dwarf_hasattr_integrate.c dwarf_hasattr.c \

+		dwarf_aggregate_size.c dwarf_siblingof.c dwarf_formsdata.c \

+		dwarf_srclang.c dwarf_formflag.c dwarf_diecu.c \

+		dwarf_bytesize.c dwarf_bitsize.c dwarf_peel_type.c \

+		dwarf_default_lower_bound.c libdw_find_split_unit.c \

+		dwarf_getalt.c dwarf_haschildren.c \

+		dwarf_begin.c dwarf_begin_elf.c dwarf_end.c frame-cache.c \

+		dwarf_get_units.c dwarf_formstring.c \

+		../libdwelf/dwelf_dwarf_gnu_debugaltlink.c

+

 if MAINTAINER_MODE

 BUILT_SOURCES = $(srcdir)/known-dwarf.h

 MAINTAINERCLEANFILES = $(srcdir)/known-dwarf.h

@@ -104,9 +124,12 @@ endif

 libdw_pic_a_SOURCES =

 am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os)

+am_libdw_static_pic_a_OBJECTS = $(libdw_static_pic_a_SOURCES:.c=.os)

 libdw_so_LIBS = libdw_pic.a ../libdwelf/libdwelf_pic.a \

-	  ../libdwfl/libdwfl_pic.a ../libebl/libebl.a

+	  ../libdwfl/libdwfl_pic.a ../libebl/libebl.a \

+	  ../backends/libebl_static_pic.a \

+	  ../libcpu/libcpu_static_pic.a

 libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so

 libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS)

 libdw_so_SOURCES =

diff --git a/libdwelf/Makefile.am b/libdwelf/Makefile.am

index 7ca767a..b526b7c 100644

--- a/libdwelf/Makefile.am

+++ b/libdwelf/Makefile.am

@@ -39,6 +39,7 @@ noinst_LIBRARIES = libdwelf.a libdwelf_pic.a

 pkginclude_HEADERS = libdwelf.h

 noinst_HEADERS = libdwelfP.h

+libdwelf_a_CFLAGS = -fPIC -fvisibility=hidden $(AM_CFLAGS)

 libdwelf_a_SOURCES = dwelf_elf_gnu_debuglink.c dwelf_dwarf_gnu_debugaltlink.c \

 		     dwelf_elf_gnu_build_id.c dwelf_scn_gnu_compressed_size.c \

 		     dwelf_strtab.c

diff --git a/libdwfl/Makefile.am b/libdwfl/Makefile.am

index 89ca92e..d9d13b2 100644

--- a/libdwfl/Makefile.am

+++ b/libdwfl/Makefile.am

@@ -39,6 +39,7 @@ noinst_LIBRARIES += libdwfl_pic.a

 pkginclude_HEADERS = libdwfl.h

+libdwfl_a_CFLAGS = -fPIC -fvisibility=hidden $(AM_CFLAGS)

 libdwfl_a_SOURCES = dwfl_begin.c dwfl_end.c dwfl_error.c dwfl_version.c \

 		    dwfl_module.c dwfl_report_elf.c relocate.c \

 		    dwfl_module_build_id.c dwfl_module_report_build_id.c \

diff --git a/libebl/Makefile.am b/libebl/Makefile.am

index 737de6b..ecebdd0 100644

--- a/libebl/Makefile.am

+++ b/libebl/Makefile.am

@@ -56,6 +56,7 @@ gen_SOURCES = eblopenbackend.c eblclosebackend.c \

 	      eblunwind.c eblresolvesym.c eblcheckreloctargettype.c \

 	      ebl_data_marker_symbol.c

+libebl_a_CFLAGS = -fvisibility=hidden $(AM_CFLAGS)

 libebl_a_SOURCES = $(gen_SOURCES)

 noinst_HEADERS = libeblP.h ebl-hooks.h

diff --git a/libebl/eblclosebackend.c b/libebl/eblclosebackend.c

index 67fbdfe..501e5c7 100644

--- a/libebl/eblclosebackend.c

+++ b/libebl/eblclosebackend.c

@@ -44,10 +44,6 @@ ebl_closebackend (Ebl *ebl)

       /* Run the destructor.  */

       ebl->destr (ebl);

-      /* Close the dynamically loaded object.  */

-      if (ebl->dlhandle != NULL)

-	(void) dlclose (ebl->dlhandle);

-

       /* Free the resources.  */

       free (ebl);

     }

diff --git a/libebl/eblopenbackend.c b/libebl/eblopenbackend.c

index f5b3de2..b04768f 100644

--- a/libebl/eblopenbackend.c

+++ b/libebl/eblopenbackend.c

@@ -41,6 +41,14 @@

 #include <system.h>

 #include <libeblP.h>

+const char *i386_init (Elf *elf, GElf_Half machine, Ebl *eh, size_t ehlen);

+const char *x86_64_init (Elf *elf, GElf_Half machine, Ebl *eh, size_t ehlen);

+const char *ppc_init (Elf *elf, GElf_Half machine, Ebl *eh, size_t ehlen);

+const char *ppc64_init (Elf *elf, GElf_Half machine, Ebl *eh, size_t ehlen);

+const char *ia64_init (Elf *elf, GElf_Half machine, Ebl *eh, size_t ehlen);

+const char *s390_init (Elf *elf, GElf_Half machine, Ebl *eh, size_t ehlen);

+const char *aarch64_init (Elf *elf, GElf_Half machine, Ebl *eh, size_t ehlen);

+const char *bpf_init (Elf *elf, GElf_Half machine, Ebl *eh, size_t ehlen);

 /* This table should contain the complete list of architectures as far

    as the ELF specification is concerned.  */

@@ -48,7 +56,7 @@

    arrays to avoid relocations.  */

 static const struct

 {

-  const char *dsoname;

+  ebl_bhinit_t initptr;

   const char *emulation;

   const char *prefix;

   int prefix_len;

@@ -57,84 +65,84 @@ static const struct

   int data;

 } machines[] =

 {

-  { "i386", "elf_i386", "i386", 4, EM_386, ELFCLASS32, ELFDATA2LSB },

-  { "ia64", "elf_ia64", "ia64", 4, EM_IA_64, ELFCLASS64, ELFDATA2LSB },

-  { "alpha", "elf_alpha", "alpha", 5, EM_ALPHA, ELFCLASS64, ELFDATA2LSB },

-  { "x86_64", "elf_x86_64", "x86_64", 6, EM_X86_64, ELFCLASS64, ELFDATA2LSB },

-  { "ppc", "elf_ppc", "ppc", 3, EM_PPC, ELFCLASS32, ELFDATA2MSB },

-  { "ppc64", "elf_ppc64", "ppc64", 5, EM_PPC64, ELFCLASS64, ELFDATA2MSB },

-  { "tilegx", "elf_tilegx", "tilegx", 6, EM_TILEGX, ELFCLASS64, ELFDATA2LSB },

+  { i386_init, "elf_i386", "i386", 4, EM_386, ELFCLASS32, ELFDATA2LSB },

+  { ia64_init, "elf_ia64", "ia64", 4, EM_IA_64, ELFCLASS64, ELFDATA2LSB },

+  { NULL, "elf_alpha", "alpha", 5, EM_ALPHA, ELFCLASS64, ELFDATA2LSB },

+  { x86_64_init, "elf_x86_64", "x86_64", 6, EM_X86_64, ELFCLASS64, ELFDATA2LSB },

+  { ppc_init, "elf_ppc", "ppc", 3, EM_PPC, ELFCLASS32, ELFDATA2MSB },

+  { ppc64_init, "elf_ppc64", "ppc64", 5, EM_PPC64, ELFCLASS64, ELFDATA2MSB },

+  { NULL, "elf_tilegx", "tilegx", 6, EM_TILEGX, ELFCLASS64, ELFDATA2LSB },

   // XXX class and machine fields need to be filled in for all archs.

-  { "sh", "elf_sh", "sh", 2, EM_SH, 0, 0 },

-  { "arm", "ebl_arm", "arm", 3, EM_ARM, 0, 0 },

-  { "sparc", "elf_sparcv9", "sparc", 5, EM_SPARCV9, 0, 0 },

-  { "sparc", "elf_sparc", "sparc", 5, EM_SPARC, 0, 0 },

-  { "sparc", "elf_sparcv8plus", "sparc", 5, EM_SPARC32PLUS, 0, 0 },

-  { "s390", "ebl_s390", "s390", 4, EM_S390, 0, 0 },

-

-  { "m32", "elf_m32", "m32", 3, EM_M32, 0, 0 },

-  { "m68k", "elf_m68k", "m68k", 4, EM_68K, ELFCLASS32, ELFDATA2MSB },

-  { "m88k", "elf_m88k", "m88k", 4, EM_88K, 0, 0 },

-  { "i860", "elf_i860", "i860", 4, EM_860, 0, 0 },

-  { "s370", "ebl_s370", "s370", 4, EM_S370, 0, 0 },

-  { "parisc", "elf_parisc", "parisc", 6, EM_PARISC, 0, 0 },

-  { "vpp500", "elf_vpp500", "vpp500", 5, EM_VPP500, 0, 0 },

-  { "sparc", "elf_v8plus", "v8plus", 6, EM_SPARC32PLUS, 0, 0 },

-  { "i960", "elf_i960", "i960", 4, EM_960, 0, 0 },

-  { "v800", "ebl_v800", "v800", 4, EM_V800, 0, 0 },

-  { "fr20", "ebl_fr20", "fr20", 4, EM_FR20, 0, 0 },

-  { "rh32", "ebl_rh32", "rh32", 4, EM_RH32, 0, 0 },

-  { "rce", "ebl_rce", "rce", 3, EM_RCE, 0, 0 },

-  { "tricore", "elf_tricore", "tricore", 7, EM_TRICORE, 0, 0 },

-  { "arc", "elf_arc", "arc", 3, EM_ARC, 0, 0 },

-  { "h8", "elf_h8_300", "h8_300", 6, EM_H8_300, 0, 0 },

-  { "h8", "elf_h8_300h", "h8_300h", 6, EM_H8_300H, 0, 0 },

-  { "h8", "elf_h8s", "h8s", 6, EM_H8S, 0, 0 },

-  { "h8", "elf_h8_500", "h8_500", 6, EM_H8_500, 0, 0 },

-  { "coldfire", "elf_coldfire", "coldfire", 8, EM_COLDFIRE, 0, 0 },

-  { "m68k", "elf_68hc12", "68hc12", 6, EM_68HC12, 0, 0 },

-  { "mma", "elf_mma", "mma", 3, EM_MMA, 0, 0 },

-  { "pcp", "elf_pcp", "pcp", 3, EM_PCP, 0, 0 },

-  { "ncpu", "elf_ncpu", "ncpu", 4, EM_NCPU, 0, 0 },

-  { "ndr1", "elf_ndr1", "ndr1", 4, EM_NDR1, 0, 0 },

-  { "starcore", "elf_starcore", "starcore", 8, EM_STARCORE, 0, 0 },

-  { "me16", "elf_me16", "em16", 4, EM_ME16, 0, 0 },

-  { "st100", "elf_st100", "st100", 5, EM_ST100, 0, 0 },

-  { "tinyj", "elf_tinyj", "tinyj", 5, EM_TINYJ, 0, 0 },

-  { "pdsp", "elf_pdsp", "pdsp", 4, EM_PDSP, 0, 0 },

-  { "fx66", "elf_fx66", "fx66", 4, EM_FX66, 0, 0 },

-  { "st9plus", "elf_st9plus", "st9plus", 7, EM_ST9PLUS, 0, 0 },

-  { "st7", "elf_st7", "st7", 3, EM_ST7, 0, 0 },

-  { "m68k", "elf_68hc16", "68hc16", 6, EM_68HC16, 0, 0 },

-  { "m68k", "elf_68hc11", "68hc11", 6, EM_68HC11, 0, 0 },

-  { "m68k", "elf_68hc08", "68hc08", 6, EM_68HC08, 0, 0 },

-  { "m68k", "elf_68hc05", "68hc05", 6, EM_68HC05, 0, 0 },

-  { "svx", "elf_svx", "svx", 3, EM_SVX, 0, 0 },

-  { "st19", "elf_st19", "st19", 4, EM_ST19, 0, 0 },

-  { "vax", "elf_vax", "vax", 3, EM_VAX, 0, 0 },

-  { "cris", "elf_cris", "cris", 4, EM_CRIS, 0, 0 },

-  { "javelin", "elf_javelin", "javelin", 7, EM_JAVELIN, 0, 0 },

-  { "firepath", "elf_firepath", "firepath", 8, EM_FIREPATH, 0, 0 },

-  { "zsp", "elf_zsp", "zsp", 3, EM_ZSP, 0, 0 },

-  { "mmix", "elf_mmix", "mmix", 4, EM_MMIX, 0, 0 },

-  { "hunay", "elf_huany", "huany", 5, EM_HUANY, 0, 0 },

-  { "prism", "elf_prism", "prism", 5, EM_PRISM, 0, 0 },

-  { "avr", "elf_avr", "avr", 3, EM_AVR, 0, 0 },

-  { "fr30", "elf_fr30", "fr30", 4, EM_FR30, 0, 0 },

-  { "dv10", "elf_dv10", "dv10", 4, EM_D10V, 0, 0 },

-  { "dv30", "elf_dv30", "dv30", 4, EM_D30V, 0, 0 },

-  { "v850", "elf_v850", "v850", 4, EM_V850, 0, 0 },

-  { "m32r", "elf_m32r", "m32r", 4, EM_M32R, 0, 0 },

-  { "mn10300", "elf_mn10300", "mn10300", 7, EM_MN10300, 0, 0 },

-  { "mn10200", "elf_mn10200", "mn10200", 7, EM_MN10200, 0, 0 },

-  { "pj", "elf_pj", "pj", 2, EM_PJ, 0, 0 },

-  { "openrisc", "elf_openrisc", "openrisc", 8, EM_OPENRISC, 0, 0 },

-  { "arc", "elf_arc_a5", "arc_a5", 6, EM_ARC_A5, 0, 0 },

-  { "xtensa", "elf_xtensa", "xtensa", 6, EM_XTENSA, 0, 0 },

-  { "aarch64", "elf_aarch64", "aarch64", 7, EM_AARCH64, ELFCLASS64, 0 },

-  { "bpf", "elf_bpf", "bpf", 3, EM_BPF, 0, 0 },

-  { "riscv", "elf_riscv", "riscv", 5, EM_RISCV, ELFCLASS64, ELFDATA2LSB },

-  { "riscv", "elf_riscv", "riscv", 5, EM_RISCV, ELFCLASS32, ELFDATA2LSB },

+  { NULL, "elf_sh", "sh", 2, EM_SH, 0, 0 },

+  { NULL, "ebl_arm", "arm", 3, EM_ARM, 0, 0 },

+  { NULL, "elf_sparcv9", "sparc", 5, EM_SPARCV9, 0, 0 },

+  { NULL, "elf_sparc", "sparc", 5, EM_SPARC, 0, 0 },

+  { NULL, "elf_sparcv8plus", "sparc", 5, EM_SPARC32PLUS, 0, 0 },

+  { s390_init, "ebl_s390", "s390", 4, EM_S390, 0, 0 },

+

+  { NULL, "elf_m32", "m32", 3, EM_M32, 0, 0 },

+  { NULL, "elf_m68k", "m68k", 4, EM_68K, ELFCLASS32, ELFDATA2MSB },

+  { NULL, "elf_m88k", "m88k", 4, EM_88K, 0, 0 },

+  { NULL, "elf_i860", "i860", 4, EM_860, 0, 0 },

+  { NULL, "ebl_s370", "s370", 4, EM_S370, 0, 0 },

+  { NULL, "elf_parisc", "parisc", 6, EM_PARISC, 0, 0 },

+  { NULL, "elf_vpp500", "vpp500", 5, EM_VPP500, 0, 0 },

+  { NULL, "elf_v8plus", "v8plus", 6, EM_SPARC32PLUS, 0, 0 },

+  { NULL, "elf_i960", "i960", 4, EM_960, 0, 0 },

+  { NULL, "ebl_v800", "v800", 4, EM_V800, 0, 0 },

+  { NULL, "ebl_fr20", "fr20", 4, EM_FR20, 0, 0 },

+  { NULL, "ebl_rh32", "rh32", 4, EM_RH32, 0, 0 },

+  { NULL, "ebl_rce", "rce", 3, EM_RCE, 0, 0 },

+  { NULL, "elf_tricore", "tricore", 7, EM_TRICORE, 0, 0 },

+  { NULL, "elf_arc", "arc", 3, EM_ARC, 0, 0 },

+  { NULL, "elf_h8_300", "h8_300", 6, EM_H8_300, 0, 0 },

+  { NULL, "elf_h8_300h", "h8_300h", 6, EM_H8_300H, 0, 0 },

+  { NULL, "elf_h8s", "h8s", 6, EM_H8S, 0, 0 },

+  { NULL, "elf_h8_500", "h8_500", 6, EM_H8_500, 0, 0 },

+  { NULL, "elf_coldfire", "coldfire", 8, EM_COLDFIRE, 0, 0 },

+  { NULL, "elf_68hc12", "68hc12", 6, EM_68HC12, 0, 0 },

+  { NULL, "elf_mma", "mma", 3, EM_MMA, 0, 0 },

+  { NULL, "elf_pcp", "pcp", 3, EM_PCP, 0, 0 },

+  { NULL, "elf_ncpu", "ncpu", 4, EM_NCPU, 0, 0 },

+  { NULL, "elf_ndr1", "ndr1", 4, EM_NDR1, 0, 0 },

+  { NULL, "elf_starcore", "starcore", 8, EM_STARCORE, 0, 0 },

+  { NULL, "elf_me16", "em16", 4, EM_ME16, 0, 0 },

+  { NULL, "elf_st100", "st100", 5, EM_ST100, 0, 0 },

+  { NULL, "elf_tinyj", "tinyj", 5, EM_TINYJ, 0, 0 },

+  { NULL, "elf_pdsp", "pdsp", 4, EM_PDSP, 0, 0 },

+  { NULL, "elf_fx66", "fx66", 4, EM_FX66, 0, 0 },

+  { NULL, "elf_st9plus", "st9plus", 7, EM_ST9PLUS, 0, 0 },

+  { NULL, "elf_st7", "st7", 3, EM_ST7, 0, 0 },

+  { NULL, "elf_68hc16", "68hc16", 6, EM_68HC16, 0, 0 },

+  { NULL, "elf_68hc11", "68hc11", 6, EM_68HC11, 0, 0 },

+  { NULL, "elf_68hc08", "68hc08", 6, EM_68HC08, 0, 0 },

+  { NULL, "elf_68hc05", "68hc05", 6, EM_68HC05, 0, 0 },

+  { NULL, "elf_svx", "svx", 3, EM_SVX, 0, 0 },

+  { NULL, "elf_st19", "st19", 4, EM_ST19, 0, 0 },

+  { NULL, "elf_vax", "vax", 3, EM_VAX, 0, 0 },

+  { NULL, "elf_cris", "cris", 4, EM_CRIS, 0, 0 },

+  { NULL, "elf_javelin", "javelin", 7, EM_JAVELIN, 0, 0 },

+  { NULL, "elf_firepath", "firepath", 8, EM_FIREPATH, 0, 0 },

+  { NULL, "elf_zsp", "zsp", 3, EM_ZSP, 0, 0 },

+  { NULL, "elf_mmix", "mmix", 4, EM_MMIX, 0, 0 },

+  { NULL, "elf_huany", "huany", 5, EM_HUANY, 0, 0 },

+  { NULL, "elf_prism", "prism", 5, EM_PRISM, 0, 0 },

+  { NULL, "elf_avr", "avr", 3, EM_AVR, 0, 0 },

+  { NULL, "elf_fr30", "fr30", 4, EM_FR30, 0, 0 },

+  { NULL, "elf_dv10", "dv10", 4, EM_D10V, 0, 0 },

+  { NULL, "elf_dv30", "dv30", 4, EM_D30V, 0, 0 },

+  { NULL, "elf_v850", "v850", 4, EM_V850, 0, 0 },

+  { NULL, "elf_m32r", "m32r", 4, EM_M32R, 0, 0 },

+  { NULL, "elf_mn10300", "mn10300", 7, EM_MN10300, 0, 0 },

+  { NULL, "elf_mn10200", "mn10200", 7, EM_MN10200, 0, 0 },

+  { NULL, "elf_pj", "pj", 2, EM_PJ, 0, 0 },

+  { NULL, "elf_openrisc", "openrisc", 8, EM_OPENRISC, 0, 0 },

+  { NULL, "elf_arc_a5", "arc_a5", 6, EM_ARC_A5, 0, 0 },

+  { NULL, "elf_xtensa", "xtensa", 6, EM_XTENSA, 0, 0 },

+  { aarch64_init, "elf_aarch64", "aarch64", 7, EM_AARCH64, ELFCLASS64, 0 },

+  { bpf_init, "elf_bpf", "bpf", 3, EM_BPF, 0, 0 },

+  { NULL, "elf_riscv", "riscv", 5, EM_RISCV, ELFCLASS64, ELFDATA2LSB },

+  { NULL, "elf_riscv", "riscv", 5, EM_RISCV, ELFCLASS32, ELFDATA2LSB },

 };

 #define nmachines (sizeof (machines) / sizeof (machines[0]))

@@ -318,46 +326,17 @@ openbackend (Elf *elf, const char *emulation, GElf_Half machine)

 #endif

 #define ORIGINDIR "$ORIGIN/../$LIB/" LIBEBL_SUBDIR "/"

-	/* Give it a try.  At least the machine type matches.  First

-           try to load the module.  */

-	char dsoname[100];

-	strcpy (stpcpy (stpcpy (dsoname, ORIGINDIR "libebl_"),

-			machines[cnt].dsoname),

-		".so");

-

-	void *h = dlopen (dsoname, RTLD_LAZY);

-	if (h == NULL)

-	  {

-	    strcpy (stpcpy (stpcpy (dsoname, "libebl_"),

-			    machines[cnt].dsoname),

-		    ".so");

-	    h = dlopen (dsoname, RTLD_LAZY);

-	  }

-

-	  /* Try without an explicit path.  */

-	if (h != NULL)

+	ebl_bhinit_t initp = machines[cnt].initptr;

+	if (1)

 	  {

-	    /* We managed to load the object.  Now see whether the

-	       initialization function likes our file.  */

 	    static const char version[] = MODVERSION;

 	    const char *modversion;

-	    ebl_bhinit_t initp;

-

-	    // We use a static number to help the compiler see we don't

-	    // overflow the stack with an arbitrary number.

-	    assert (machines[cnt].prefix_len <= MAX_PREFIX_LEN);

-	    char symname[MAX_PREFIX_LEN + sizeof "_init"];

-

-	    strcpy (mempcpy (symname, machines[cnt].prefix,

-			     machines[cnt].prefix_len), "_init");

-

-	    initp = (ebl_bhinit_t) dlsym (h, symname);

 	    if (initp != NULL

 		&& (modversion = initp (elf, machine, result, sizeof (Ebl)))

 		&& strcmp (version, modversion) == 0)

 	      {

 		/* We found a module to handle our file.  */

-		result->dlhandle = h;

+		result->dlhandle = NULL;

 		result->elf = elf;

 		/* A few entries are mandatory.  */

@@ -366,9 +345,6 @@ openbackend (Elf *elf, const char *emulation, GElf_Half machine)

 		return result;

 	      }

-

-	    /* Not the module we need.  */

-	    (void) dlclose (h);

 	  }

 	/* We cannot find a DSO but the emulation/machine ID matches.

diff --git a/libelf/Makefile.am b/libelf/Makefile.am

index ddaeaa2..ba4e3eb 100644

--- a/libelf/Makefile.am

+++ b/libelf/Makefile.am

@@ -41,6 +41,7 @@ include_HEADERS = libelf.h gelf.h nlist.h

 pkginclude_HEADERS = elf-knowledge.h

+libelf_a_CFLAGS = -fPIC -fvisibility=hidden $(AM_CFLAGS)

 libelf_a_SOURCES = elf_version.c elf_hash.c elf_error.c elf_fill.c \

 		   elf_begin.c elf_next.c elf_rand.c elf_end.c elf_kind.c \

 		   gelf_getclass.c elf_getbase.c elf_getident.c \

diff --git a/src/Makefile.am b/src/Makefile.am

index 2b1c0dc..657b21a 100644

--- a/src/Makefile.am

+++ b/src/Makefile.am

@@ -47,7 +47,8 @@ libasm = ../libasm/libasm.so

 libdw = ../libdw/libdw.so

 libelf = ../libelf/libelf.so

 endif

-libebl = ../libebl/libebl.a

+libebl = ../libebl/libebl.a ../backends/libebl_static_pic.a ../libcpu/libcpu_static_pic.a

+libdw_static = ../libdw/libdw_static_pic.a

 libeu = ../lib/libeu.a

 if DEMANGLE

@@ -67,16 +68,17 @@ ranlib_no_Wstack_usage = yes

 ar_no_Wstack_usage = yes

 unstrip_no_Wstack_usage = yes

+

 readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl

 nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl \

 	   $(demanglelib)

 size_LDADD = $(libelf) $(libeu) $(argp_LDADD)

 strip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) -ldl

-elflint_LDADD  = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl

+elflint_LDADD  = $(libebl) $(libdw_static) $(libelf) $(libeu) $(argp_LDADD) -ldl

 findtextrel_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD)

 addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(demanglelib)

-elfcmp_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl

-objdump_LDADD  = $(libasm) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl

+elfcmp_LDADD = $(libebl) $(libdw_static) $(libeu) $(libelf) $(argp_LDADD) -ldl

+objdump_LDADD  = $(libasm) $(libebl) $(libdw_static) $(libelf) $(libeu) $(argp_LDADD) -ldl

 ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD)

 strings_LDADD = $(libelf) $(libeu) $(argp_LDADD)

 ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD)

diff --git a/tests/Makefile.am b/tests/Makefile.am

index 74c477e..b060587 100644

--- a/tests/Makefile.am

+++ b/tests/Makefile.am

@@ -86,9 +86,8 @@ TESTS = run-arextract.sh run-arsymtest.sh run-ar.sh newfile test-nlist \

 	newscn run-strip-test.sh run-strip-test2.sh \

 	run-strip-test3.sh run-strip-test4.sh run-strip-test5.sh \

 	run-strip-test6.sh run-strip-test7.sh run-strip-test8.sh \

-	run-strip-test9.sh run-strip-test10.sh run-strip-test11.sh \

-	run-strip-test12.sh \

-	run-strip-nothing.sh run-strip-g.sh run-annobingroup.sh \

+	run-strip-test9.sh run-strip-test10.sh \

+	run-strip-nothing.sh run-strip-g.sh \

 	run-strip-groups.sh run-strip-reloc.sh run-strip-strmerge.sh \

 	run-strip-nobitsalign.sh run-strip-remove-keep.sh \

 	run-unstrip-test.sh run-unstrip-test2.sh run-unstrip-test3.sh \

@@ -465,7 +464,8 @@ libdw = ../libdw/libdw.so

 libelf = ../libelf/libelf.so

 libasm = ../libasm/libasm.so

 endif

-libebl = ../libebl/libebl.a

+libebl = ../libebl/libebl.a ../backends/libebl_static_pic.a ../libcpu/libcpu_static_pic.a

+libdw_static = ../libdw/libdw_static_pic.a

 libeu = ../lib/libeu.a

 endif !STANDALONE

@@ -495,6 +495,7 @@ get_files_LDADD = $(libdw) $(libelf)

 next_files_LDADD = $(libdw) $(libelf)

 get_aranges_LDADD = $(libdw) $(libelf)

 allfcts_LDADD = $(libdw) $(libelf)

+line2addr_no_Wformat = yes

 line2addr_LDADD = $(libdw) $(argp_LDADD)

 addrscopes_LDADD = $(libdw) $(argp_LDADD)

 funcscopes_LDADD = $(libdw) $(argp_LDADD)

diff --git a/tests/run-addrcfi.sh b/tests/run-addrcfi.sh

index fd89d02..76db7d2 100755

--- a/tests/run-addrcfi.sh

+++ b/tests/run-addrcfi.sh

@@ -3521,82 +3521,6 @@ testrun_compare ${abs_builddir}/addrcfi -e testfiles390x 0x0000000080000510 <<\E

 handle_cfi no CFI (.debug_frame): no error

 EOF

-# EM_ARM (function bar 0x00008510)

-# Note. Only in .debug_frame, the .eh_frame is actually empty.

-# Same as s390 and ppc above.

-testfiles testfilearm

-testrun_compare ${abs_builddir}/addrcfi -e testfilearm 0x00008510 <<\EOF

-dwarf_cfi_addrframe (.eh_frame): no matching address range

-.debug_frame has 0x8510 => [0x8510, 0x8524):

-	return address in reg14

-	CFA location expression: bregx(13)

-	integer reg0 (r0): undefined

-	integer reg1 (r1): undefined

-	integer reg2 (r2): undefined

-	integer reg3 (r3): undefined

-	integer reg4 (r4): same_value

-	integer reg5 (r5): same_value

-	integer reg6 (r6): same_value

-	integer reg7 (r7): same_value

-	integer reg8 (r8): same_value

-	integer reg9 (r9): undefined

-	integer reg10 (r10): same_value

-	integer reg11 (r11): same_value

-	integer reg12 (r12): undefined

-	integer reg13 (sp): location expression: call_frame_cfa stack_value

-	integer reg14 (lr): same_value

-	integer reg15 (pc): location expression: regx(14)

-	FPA reg16 (f0): undefined

-	FPA reg17 (f1): undefined

-	FPA reg18 (f2): undefined

-	FPA reg19 (f3): undefined

-	FPA reg20 (f4): undefined

-	FPA reg21 (f5): undefined

-	FPA reg22 (f6): undefined

-	FPA reg23 (f7): undefined

-	FPA reg96 (f0): undefined

-	FPA reg97 (f1): undefined

-	FPA reg98 (f2): undefined

-	FPA reg99 (f3): undefined

-	FPA reg100 (f4): undefined

-	FPA reg101 (f5): undefined

-	FPA reg102 (f6): undefined

-	FPA reg103 (f7): undefined

-	integer reg128 (spsr): undefined

-	VFP reg256 (d0): undefined

-	VFP reg257 (d1): undefined

-	VFP reg258 (d2): undefined

-	VFP reg259 (d3): undefined

-	VFP reg260 (d4): undefined

-	VFP reg261 (d5): undefined

-	VFP reg262 (d6): undefined

-	VFP reg263 (d7): undefined

-	VFP reg264 (d8): same_value

-	VFP reg265 (d9): same_value

-	VFP reg266 (d10): same_value

-	VFP reg267 (d11): same_value

-	VFP reg268 (d12): same_value

-	VFP reg269 (d13): same_value

-	VFP reg270 (d14): same_value

-	VFP reg271 (d15): same_value

-	VFP reg272 (d16): undefined

-	VFP reg273 (d17): undefined

-	VFP reg274 (d18): undefined

-	VFP reg275 (d19): undefined

-	VFP reg276 (d20): undefined

-	VFP reg277 (d21): undefined

-	VFP reg278 (d22): undefined

-	VFP reg279 (d23): undefined

-	VFP reg280 (d24): undefined

-	VFP reg281 (d25): undefined

-	VFP reg282 (d26): undefined

-	VFP reg283 (d27): undefined

-	VFP reg284 (d28): undefined

-	VFP reg285 (d29): undefined

-	VFP reg286 (d30): undefined

-	VFP reg287 (d31): undefined

-EOF

-

 # EM_AARCH64 (function bar 0x400550)

 # Same as arm, 390 and ppc above.

 # Note missing coverage in .eh_frame.

diff --git a/tests/run-allregs.sh b/tests/run-allregs.sh

index 1422bd6..0d2eb52 100755

--- a/tests/run-allregs.sh

+++ b/tests/run-allregs.sh

@@ -2344,387 +2344,6 @@ control registers:

 	 65: %pswa (pswa), address 64 bits

 EOF

-regs_test testfile30 <<\EOF

-integer registers:

-	  0: %g0 (g0), signed 32 bits

-	  1: %g1 (g1), signed 32 bits

-	  2: %g2 (g2), signed 32 bits

-	  3: %g3 (g3), signed 32 bits

-	  4: %g4 (g4), signed 32 bits

-	  5: %g5 (g5), signed 32 bits

-	  6: %g6 (g6), signed 32 bits

-	  7: %g7 (g7), signed 32 bits

-	  8: %o0 (o0), signed 32 bits

-	  9: %o1 (o1), signed 32 bits

-	 10: %o2 (o2), signed 32 bits

-	 11: %o3 (o3), signed 32 bits

-	 12: %o4 (o4), signed 32 bits

-	 13: %o5 (o5), signed 32 bits

-	 14: %o6 (o6), address 32 bits

-	 15: %o7 (o7), signed 32 bits

-	 16: %l0 (l0), signed 32 bits

-	 17: %l1 (l1), signed 32 bits

-	 18: %l2 (l2), signed 32 bits

-	 19: %l3 (l3), signed 32 bits

-	 20: %l4 (l4), signed 32 bits

-	 21: %l5 (l5), signed 32 bits

-	 22: %l6 (l6), signed 32 bits

-	 23: %l7 (l7), signed 32 bits

-	 24: %i0 (i0), signed 32 bits

-	 25: %i1 (i1), signed 32 bits

-	 26: %i2 (i2), signed 32 bits

-	 27: %i3 (i3), signed 32 bits

-	 28: %i4 (i4), signed 32 bits

-	 29: %i5 (i5), signed 32 bits

-	 30: %i6 (i6), address 32 bits

-	 31: %i7 (i7), signed 32 bits

-FPU registers:

-	 32: %f0 (f0), float 32 bits

-	 33: %f1 (f1), float 32 bits

-	 34: %f2 (f2), float 32 bits

-	 35: %f3 (f3), float 32 bits

-	 36: %f4 (f4), float 32 bits

-	 37: %f5 (f5), float 32 bits

-	 38: %f6 (f6), float 32 bits

-	 39: %f7 (f7), float 32 bits

-	 40: %f8 (f8), float 32 bits

-	 41: %f9 (f9), float 32 bits

-	 42: %f10 (f10), float 32 bits

-	 43: %f11 (f11), float 32 bits

-	 44: %f12 (f12), float 32 bits

-	 45: %f13 (f13), float 32 bits

-	 46: %f14 (f14), float 32 bits

-	 47: %f15 (f15), float 32 bits

-	 48: %f16 (f16), float 32 bits

-	 49: %f17 (f17), float 32 bits

-	 50: %f18 (f18), float 32 bits

-	 51: %f19 (f19), float 32 bits

-	 52: %f20 (f20), float 32 bits

-	 53: %f21 (f21), float 32 bits

-	 54: %f22 (f22), float 32 bits

-	 55: %f23 (f23), float 32 bits

-	 56: %f24 (f24), float 32 bits

-	 57: %f25 (f25), float 32 bits

-	 58: %f26 (f26), float 32 bits

-	 59: %f27 (f27), float 32 bits

-	 60: %f28 (f28), float 32 bits

-	 61: %f29 (f29), float 32 bits

-	 62: %f30 (f30), float 32 bits

-	 63: %f31 (f31), float 32 bits

-control registers:

-	 64: %y (y), unsigned 32 bits

-	 65: %psr (psr), unsigned 32 bits

-	 66: %wim (wim), unsigned 32 bits

-	 67: %tbr (tbr), unsigned 32 bits

-	 68: %pc (pc), address 32 bits

-	 69: %npc (npc), address 32 bits

-	 70: %fsr (fsr), unsigned 32 bits

-	 71: %csr (csr), unsigned 32 bits

-EOF

-

-regs_test testfile31 <<\EOF

-integer registers:

-	  0: %g0 (g0), signed 64 bits

-	  1: %g1 (g1), signed 64 bits

-	  2: %g2 (g2), signed 64 bits

-	  3: %g3 (g3), signed 64 bits

-	  4: %g4 (g4), signed 64 bits

-	  5: %g5 (g5), signed 64 bits