On Sat, Sep 16, 2017 at 9:23 PM, Christian Weisgerber <na...@mips.inka.de> wrote: > Karel Gardas: > >> I've update my elf.h transition patch and posted on tech@ here >> https://marc.info/?l=openbsd-tech&m=150551268819592&w=2 -- I'm running > > This patch doesn't apply. > There is no file src/lib/libc/gen/elf_hash.c in -CURRENT.
Thanks for the heads up. Looks like cvs bug or my misunderstanding how diff is working. The history of this is that I editted elf_hash.c which was later removed by cvs update. Still when I invoke cvs -q diff -u -- it still diffs also removed elf_hash.c. I've checked this file is neither in my tree... I think it should be just enough if you remove this problematic hunk: Index: lib/libc/gen/elf_hash.c =================================================================== RCS file: /cvs/src/lib/libc/gen/Attic/elf_hash.c,v retrieving revision 1.9 diff -u -p -u -r1.9 elf_hash.c --- lib/libc/gen/elf_hash.c 16 Jan 2015 16:48:51 -0000 1.9 +++ lib/libc/gen/elf_hash.c 16 Sep 2017 19:32:12 -0000 @@ -37,7 +37,7 @@ #include <unistd.h> #include <sys/exec.h> -#include <elf_abi.h> +#include <elf.h> /* * Standard ELF ABI hash function.
