This is an archive of the discontinued LLVM Phabricator instance.

[libunwind] Don't enable _LIBUNWIND_BUILD_ZERO_COST_APIS if building the SJLJ APIs
ClosedPublic

Authored by mstorsjo on Jan 25 2018, 1:05 PM.

Reviewers

Commits

Summary

Otherwise, a shared library build with SJLJ APIs enabled would end up with duplicate symbols.

This didn't occur for the apple && arm case due to specifically checking for that in the surrounding ifdef.

Ugh, I really wish that we could simplify that wrapping conditional.

This revision is now accepted and ready to land.Jan 25 2018, 4:58 PM

This revision was automatically updated to reflect the committed changes.

Path

Size

libunwind/

trunk/

src/

2 lines

	Show First 20 Lines • Show All 66 Lines • ▼ Show 20 Lines
	#define _LIBUNWIND_SUPPORT_FRAME_APIS			#define _LIBUNWIND_SUPPORT_FRAME_APIS
	#endif			#endif

	#if defined(__i386__) \|\| defined(__x86_64__) \|\| \			#if defined(__i386__) \|\| defined(__x86_64__) \|\| \
	defined(__ppc__) \|\| defined(__ppc64__) \|\| defined(__powerpc64__) \|\| \			defined(__ppc__) \|\| defined(__ppc64__) \|\| defined(__powerpc64__) \|\| \
	(!defined(__APPLE__) && defined(__arm__)) \|\| \			(!defined(__APPLE__) && defined(__arm__)) \|\| \
	(defined(__arm64__) \|\| defined(__aarch64__)) \|\| \			(defined(__arm64__) \|\| defined(__aarch64__)) \|\| \
	defined(__mips__)			defined(__mips__)
				#if !defined(_LIBUNWIND_BUILD_SJLJ_APIS)
	#define _LIBUNWIND_BUILD_ZERO_COST_APIS			#define _LIBUNWIND_BUILD_ZERO_COST_APIS
	#endif			#endif
				#endif

	#if defined(__powerpc64__) && defined(_ARCH_PWR8)			#if defined(__powerpc64__) && defined(_ARCH_PWR8)
	#define PPC64_HAS_VMX			#define PPC64_HAS_VMX
	#endif			#endif

	#if defined(NDEBUG) && defined(_LIBUNWIND_IS_BAREMETAL)			#if defined(NDEBUG) && defined(_LIBUNWIND_IS_BAREMETAL)
	#define _LIBUNWIND_ABORT(msg) \			#define _LIBUNWIND_ABORT(msg) \
	do { \			do { \
	▲ Show 20 Lines • Show All 93 Lines • Show Last 20 Lines