OpenBSD patches for base / split from CR #8275005

base/third_party/symbolize/symbolize.cc

 // Copyright (c) 2006, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 28 matching lines @@
 // - sizeof(Elf32_Sym)  = 16
 // - sizeof(Elf32_Shdr) = 40
 // - sizeof(Elf64_Sym)  = 24
 // - sizeof(Elf64_Shdr) = 64
 //
 // This implementation is intended to be async-signal-safe but uses
 // some functions which are not guaranteed to be so, such as memchr()
 // and memmove().  We assume they are async-signal-safe.
 //
 
+#include "build/build_config.h"
 #include "utilities.h"
 
 #if defined(HAVE_SYMBOLIZE)
 
 #include <limits>
 
 #include "symbolize.h"
 #include "demangle.h"
 
 _START_GOOGLE_NAMESPACE_
@@ skipping 29 matching lines @@
       memmove(out, demangled, len + 1);
     }
   }
 }
 
 _END_GOOGLE_NAMESPACE_
 
 #if defined(__ELF__)
 
 #include <dlfcn.h>
+#if defined(OS_OPENBSD)
+#include <sys/exec_elf.h>
+#else
 #include <elf.h>
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ skipping 562 matching lines @@
 
 // TODO: Support other environments.
 bool Symbolize(void *pc, char *out, int out_size) {
   assert(0);
   return false;
 }
 
 _END_GOOGLE_NAMESPACE_
 
 #endif