libasm.h: Don't include libebl.h. Define an opaque Ebl handle.

Using libasm isn't really usable without a way to create an Ebl handle.
But we don't support libebl.h (and libebl itself). Just define the
Ebl handle as an opaque struct. Code that uses it needs to figure out
how to instantiate one itself (they cannot in any supportable way...)

Signed-off-by: Mark Wielaard <mark@klomp.org>

diff --git a/libasm/ChangeLog b/libasm/ChangeLog
index a1abac8899b65b7ae05dbc4e1c3c2d0a6ebdbc34..7b0d3df344547a1ab4082b348b9969e62dd0d2ac 100644 (file)
--- a/libasm/ChangeLog
+++ b/libasm/ChangeLog
@@ -1,3 +1,8 @@
+2020-01-08  Mark Wielaard  <mark@klomp.org>
+
+       * libasm.h: Don't include libebl.h. Define an opaque Ebl handle.
+       * libasmP.h: Do include libebl.h.
+
 2019-08-28  Mark Wielaard  <mark@klomp.org>
 
        * Makefile.am (libasm_so_DEPS): Replace libebl.a with libebl_pic.a.

diff --git a/libasm/libasm.h b/libasm/libasm.h
index 5c6122436c3364e396a1525964d19165688608ae..a45c9fa35ee450a15df2b86d0c834f92f261a36d 100644 (file)
--- a/libasm/libasm.h
+++ b/libasm/libasm.h
@@ -32,7 +32,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <libebl.h>
+typedef struct ebl Ebl;
 
 
 /* Opaque type for the assembler context descriptor.  */

diff --git a/libasm/libasmP.h b/libasm/libasmP.h
index 54460cf95d218c37b62965b46db5fb2a0a845819..a4703fc3255491f8933293ef1e974a3d65dbe22a 100644 (file)
--- a/libasm/libasmP.h
+++ b/libasm/libasmP.h
@@ -31,6 +31,7 @@
 
 #include <stdio.h>
 
+#include "libebl.h"
 #include <libasm.h>
 
 #include "libdwelf.h"

diff --git a/tests/ChangeLog b/tests/ChangeLog
index f322b6a447ea86ca2dd1a75bc01f3745cd8909ee..3e1c367d7f9b98c3e4c1330beb098af0d0e9008b 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2020-01-08  Mark Wielaard  <mark@klomp.org>
+
+       * asm-test?.c: include libebl.h.
+
 2020-01-11  Frank Ch. Eigler  <fche@redhat.com>
 
        * run-debuginfod-find.sh: Test --fdcache* options.

diff --git a/tests/asm-tst1.c b/tests/asm-tst1.c
index 9afc676b2e40058c41324f4dc80b32aef8e99cbf..cdf2a921a97521871806add3f3e70a70f1f93274 100644 (file)
--- a/tests/asm-tst1.c
+++ b/tests/asm-tst1.c
@@ -20,6 +20,7 @@
 #endif
 
 #include <fcntl.h>
+#include ELFUTILS_HEADER(ebl)
 #include ELFUTILS_HEADER(asm)
 #include <libelf.h>
 #include <stdio.h>

diff --git a/tests/asm-tst2.c b/tests/asm-tst2.c
index 2556d0c414ba9fb241301cdf36c6bb1ed63222d2..9e88b70cefdaf90b66dfc20964c51217cb24521f 100644 (file)
--- a/tests/asm-tst2.c
+++ b/tests/asm-tst2.c
@@ -20,6 +20,7 @@
 #endif
 
 #include <fcntl.h>
+#include ELFUTILS_HEADER(ebl)
 #include ELFUTILS_HEADER(asm)
 #include <libelf.h>
 #include <stdio.h>

diff --git a/tests/asm-tst3.c b/tests/asm-tst3.c
index e52cfbe11a5633a35408ca5bb3c520917092f756..39c1d90c1ed54109f4d645298398431c2567997c 100644 (file)
--- a/tests/asm-tst3.c
+++ b/tests/asm-tst3.c
@@ -20,6 +20,7 @@
 #endif
 
 #include <fcntl.h>
+#include ELFUTILS_HEADER(ebl)
 #include ELFUTILS_HEADER(asm)
 #include <libelf.h>
 #include <stdio.h>

diff --git a/tests/asm-tst4.c b/tests/asm-tst4.c
index 52e9e20bca33bad93e74f1818cc97319b5a7ebb1..5114938b8986207459eb27fdf0eed5d3c4445406 100644 (file)
--- a/tests/asm-tst4.c
+++ b/tests/asm-tst4.c
@@ -20,6 +20,7 @@
 #endif
 
 #include <fcntl.h>
+#include ELFUTILS_HEADER(ebl)
 #include ELFUTILS_HEADER(asm)
 #include <libelf.h>
 #include <stdio.h>

diff --git a/tests/asm-tst5.c b/tests/asm-tst5.c
index 5a29b01c35994468d3708a82a480fefe971f5407..dcb852f81770b28d7579568b39714127c93e99e9 100644 (file)
--- a/tests/asm-tst5.c
+++ b/tests/asm-tst5.c
@@ -20,6 +20,7 @@
 #endif
 
 #include <fcntl.h>
+#include ELFUTILS_HEADER(ebl)
 #include ELFUTILS_HEADER(asm)
 #include <libelf.h>
 #include <stdio.h>

diff --git a/tests/asm-tst6.c b/tests/asm-tst6.c
index bd9b362b9be3f9382a77d1c3e7b3f8857f795dcd..829cd90cda0ae6ecf27e1ac317bedcf0e6c593de 100644 (file)
--- a/tests/asm-tst6.c
+++ b/tests/asm-tst6.c
@@ -19,6 +19,7 @@
 # include <config.h>
 #endif
 
+#include ELFUTILS_HEADER(ebl)
 #include ELFUTILS_HEADER(asm)
 #include <libelf.h>
 #include <stdio.h>

diff --git a/tests/asm-tst7.c b/tests/asm-tst7.c
index 00cb2bfe6319f23a10f5489d1f226b37677a23b9..901797695c5eb2040cd4c1205f9eae5656734f32 100644 (file)
--- a/tests/asm-tst7.c
+++ b/tests/asm-tst7.c
@@ -21,6 +21,7 @@
 
 #include <fcntl.h>
 #include <inttypes.h>
+#include ELFUTILS_HEADER(ebl)
 #include ELFUTILS_HEADER(asm)
 #include <libelf.h>
 #include <stdio.h>

diff --git a/tests/asm-tst8.c b/tests/asm-tst8.c
index 4fb0d998712ee5588ae5a86d37874f94013f1507..a65509fef1fede54f4062cc62bfa0172771cce6f 100644 (file)
--- a/tests/asm-tst8.c
+++ b/tests/asm-tst8.c
@@ -21,6 +21,7 @@
 
 #include <fcntl.h>
 #include <inttypes.h>
+#include ELFUTILS_HEADER(ebl)
 #include ELFUTILS_HEADER(asm)
 #include <libelf.h>
 #include <stdio.h>

diff --git a/tests/asm-tst9.c b/tests/asm-tst9.c
index b6d0e4314b3a354fb620da954a7f4a34b12608ef..681e872df020e7c924138ab9a5db25a33068010e 100644 (file)
--- a/tests/asm-tst9.c
+++ b/tests/asm-tst9.c
@@ -21,6 +21,7 @@
 
 #include <fcntl.h>
 #include <inttypes.h>
+#include ELFUTILS_HEADER(ebl)
 #include ELFUTILS_HEADER(asm)
 #include <libelf.h>
 #include <stdio.h>