This is an archive of the discontinued LLVM Phabricator instance.

Differential D75907

[compiler-rt] Define ElfW() macro if it's not defined
ClosedPublic

Authored by broadwaylamb on Mar 10 2020, 4:48 AM.

Details

Reviewers
compnerd
kcc
Commits
rGf7c4d796ba67: [compiler-rt] Define ElfW() macro if it's not defined
Summary

The ElfW() macro is not provided by <link.h> on some
systems (e.g., FreeBSD). On these systems the data structures are
just called Elf_XXX. Define ElfW() locally.

(This fix is taken from libunwind.)

Diff Detail

Event Timeline

broadwaylamb created this revision.Mar 10 2020, 4:48 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptMar 10 2020, 4:48 AM
Herald added subscribers: llvm-commits, Restricted Project, krytarowski and 3 others. · View Herald Transcript
Harbormaster completed remote builds in B48658: Diff 249316.Mar 10 2020, 5:48 AM
compnerd accepted this revision.Mar 10 2020, 8:14 AM

*sigh* ELF, couldn't you just add that macro to the standard? (We have something similar in libunwind to deal with this). LGTM

This revision is now accepted and ready to land.Mar 10 2020, 8:14 AM
Closed by commit rGf7c4d796ba67: [compiler-rt] Define ElfW() macro if it's not defined (authored by broadwaylamb). · Explain WhyMar 10 2020, 9:13 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
compiler-rt/
lib/
sanitizer_common/
4 lines

Diff 249408

compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp

Show All 29 Lines
#include <dlfcn.h> // for dlsym() #include <dlfcn.h> // for dlsym()
#include <link.h> #include <link.h>
#include <pthread.h> #include <pthread.h>
#include <signal.h> #include <signal.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <syslog.h> #include <syslog.h>
#if !defined(ElfW)
#define ElfW(type) Elf_##type
#endif
#if SANITIZER_FREEBSD #if SANITIZER_FREEBSD
#include <pthread_np.h> #include <pthread_np.h>
#include <osreldate.h> #include <osreldate.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#define pthread_getattr_np pthread_attr_get_np #define pthread_getattr_np pthread_attr_get_np
#endif #endif
#if SANITIZER_OPENBSD #if SANITIZER_OPENBSD
▲ Show 20 Lines • Show All 797 Lines • Show Last 20 Lines