On 12/09/17(Tue) 16:23, Christian Weisgerber wrote:
> Martin Pieuchot:
>
> > > So here's a first step, introducing /usr/include/elf.h. Could some of
> > > you run a bulk with it and report the possible breakages?
> >
> > Now that the offending function declaration has been remove from libc
> > libelf builds as before.
> >
> > Could you guys tell us if there's any other fallout from this diff?
>
> On amd64, two ports failed to build: devel/libdwarf and devel/valgrind.
Thanks, here's an updated diff that should fix those.
Index: sys/sys/exec_elf.h
===================================================================
RCS file: /cvs/src/sys/sys/exec_elf.h,v
retrieving revision 1.75
diff -u -p -r1.75 exec_elf.h
--- sys/sys/exec_elf.h 5 Sep 2017 06:35:19 -0000 1.75
+++ sys/sys/exec_elf.h 3 Oct 2017 13:54:57 -0000
@@ -187,12 +187,14 @@ typedef struct {
#define EM_PARISC 15 /* HPPA */
#define EM_SPARC32PLUS 18 /* Enhanced instruction set SPARC */
#define EM_PPC 20 /* PowerPC */
+#define EM_PPC64 21 /* PowerPC 64 */
#define EM_ARM 40 /* Advanced RISC Machines ARM */
#define EM_ALPHA 41 /* DEC ALPHA */
-#define EM_SH 42 /* Hitachi/Renesas Super-H */
+#define EM_SH 42 /* Hitachi/Renesas Super-H */
#define EM_SPARCV9 43 /* SPARC version 9 */
#define EM_IA_64 50 /* Intel IA-64 Processor */
#define EM_AMD64 62 /* AMD64 architecture */
+#define EM_X86_64 EM_AMD64
#define EM_VAX 75 /* DEC VAX */
#define EM_AARCH64 183 /* ARM 64-bit architecture (AArch64) */
Index: include/Makefile
===================================================================
RCS file: /cvs/src/include/Makefile,v
retrieving revision 1.219
diff -u -p -r1.219 Makefile
--- include/Makefile 17 Apr 2017 15:53:21 -0000 1.219
+++ include/Makefile 9 Aug 2017 15:46:46 -0000
@@ -10,9 +10,10 @@
.include <bsd.own.mk>
FILES= a.out.h ar.h asr.h assert.h bitstring.h blf.h bsd_auth.h \
- complex.h cpio.h ctype.h curses.h db.h dirent.h disktab.h \
- dlfcn.h elf_abi.h err.h errno.h fenv.h float.h fnmatch.h fstab.h fts.h \
- ftw.h getopt.h glob.h grp.h icdb.h ieeefp.h ifaddrs.h inttypes.h \
+ complex.h cpio.h ctype.h curses.h db.h dirent.h disktab.h dlfcn.h \
+ elf.h elf_abi.h err.h errno.h \
+ fenv.h float.h fnmatch.h fstab.h fts.h ftw.h \
+ getopt.h glob.h grp.h icdb.h ieeefp.h ifaddrs.h inttypes.h \
iso646.h kvm.h langinfo.h libgen.h limits.h link.h link_elf.h \
locale.h login_cap.h math.h md5.h memory.h ndbm.h netdb.h netgroup.h \
nlist.h nl_types.h paths.h poll.h pwd.h ranlib.h readpassphrase.h \
Index: include/elf.h
===================================================================
RCS file: include/elf.h
diff -N include/elf.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ include/elf.h 9 Aug 2017 15:49:08 -0000
@@ -0,0 +1,12 @@
+/* $OpenBSD$ */
+
+/*
+ * Public domain.
+ */
+
+#ifndef _ELF_H_
+#define _ELF_H_
+
+#include <sys/exec_elf.h>
+
+#endif /* _ELF_H_ */
