ports/devel/heaptrack/files/patch-src_track_heaptrack__inject.cpp
Adriaan de Groot 367e6bacf4 devel/heaptrack Try to fix 32-bit build
I don't see that this can ever have built on 32-bit FreeBSD (i386
in particular) because the code uses Sxword, which our elf32.h
doesn't define. The Linux elf.h (which hanbles both sizes) does
define a 64-bit Sxword.

The patch throws in a using (typedef, but C++-style) that mimics
the 64-bit integers used in the Linux headers; this 64-bit value
doesn't match the size of Elf32_Dyn fields in either OS, but
I'll take a warning over non-stop build failures any day.
2020-06-01 23:20:08 +00:00

21 lines
726 B
C++

--- src/track/heaptrack_inject.cpp.orig 2020-06-01 22:47:27 UTC
+++ src/track/heaptrack_inject.cpp
@@ -66,8 +66,18 @@ using Dyn = ElfW(Dyn);
using Rel = ElfW(Rel);
using Rela = ElfW(Rela);
using Sym = ElfW(Sym);
+#if __WORDSIZE == 64
using Sxword = ElfW(Sxword);
using Xword = ElfW(Xword);
+#else
+// FreeBSD elf32.h doesn't define Elf32_Sxword or _Xword. This is used in struct
+// elftable, where it's used as a tag value. Our Elf32_Dyn uses Elf32_Sword there,
+// as does the Linux definition (and the standard); the El64_Dyn uses Sxword.
+//
+// Linux elf.h defines Elf32_Sxword as a 64-bit quantity, so let's do that
+using Sxword = int64_t;
+using Xword = uint64_t;
+#endif
}
void overwrite_symbols() noexcept;