This is an archive of the discontinued LLVM Phabricator instance.

[libc++abi] Disable libc++ extern templates project-wide
ClosedPublic

Authored by smeenai on Apr 20 2017, 5:01 PM.

Download Raw Diff

Details

Reviewers

mclow.lists
EricWF

Commits

rGf43726cd22b2: [libc++abi] Disable libc++ extern templates project-wide
rCXXA302739: [libc++abi] Disable libc++ extern templates project-wide
rL302739: [libc++abi] Disable libc++ extern templates project-wide

Summary

libc++abi can't depend on libc++, so disable extern templates in libc++
headers project-wide. This was previously done in cxa_demangle.cpp, but
I consider it more appropriate to do at the cmake level (since none of
libc++abi's source files can use libc++ extern templates).

I also think the _LIBCPP_NO_EXCEPTIONS in cxa_demangle.cpp is
suspicious, but I'm doing one thing at a time.

Diff Detail

Repository: rL LLVM

Event Timeline

smeenai created this revision.Apr 20 2017, 5:01 PM

Herald edited edge metadata. · View Herald TranscriptApr 20 2017, 5:01 PM

Herald added a subscriber: mgorny. · View Herald Transcript

Ping.

The reason I've been punting on this is that I want to set up ABI list checks for libc++abi just like we do for libc++.

@smeenai If you can verify that this change doesn't affect the libc++abi export lists on OS X and Linux then it LGTM, but I want that to be confirmed before committing.

Fair enough. I'll probably get to that tomorrow.

Also ABI list checks for libc++abi sound awesome.

Confirmed that there are no ABI changed on both Linux and macOS.

Closed by commit rL302739: [libc++abi] Disable libc++ extern templates project-wide (authored by smeenai). · Explain WhyMay 10 2017, 3:05 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

libcxxabi/

trunk/

CMakeLists.txt

3 lines

src/

cxa_demangle.cpp

1 line

Diff 98540

libcxxabi/trunk/CMakeLists.txt

	Show First 20 Lines • Show All 451 Lines • ▼ Show 20 Lines
	if (LIBCXXABI_HAS_EXTERNAL_THREAD_API)			if (LIBCXXABI_HAS_EXTERNAL_THREAD_API)
	add_definitions(-D_LIBCPP_HAS_THREAD_API_EXTERNAL)			add_definitions(-D_LIBCPP_HAS_THREAD_API_EXTERNAL)
	endif()			endif()

	if (LIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY)			if (LIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY)
	add_definitions(-D_LIBCPP_HAS_THREAD_LIBRARY_EXTERNAL)			add_definitions(-D_LIBCPP_HAS_THREAD_LIBRARY_EXTERNAL)
	endif()			endif()

				# Prevent libc++abi from having library dependencies on libc++
				add_definitions(-D_LIBCPP_DISABLE_EXTERN_TEMPLATE)

	if (MSVC)			if (MSVC)
	add_definitions(-D_CRT_SECURE_NO_WARNINGS)			add_definitions(-D_CRT_SECURE_NO_WARNINGS)
	endif()			endif()

	# Define LIBCXXABI_USE_LLVM_UNWINDER for conditional compilation.			# Define LIBCXXABI_USE_LLVM_UNWINDER for conditional compilation.
	if (LIBCXXABI_USE_LLVM_UNWINDER)			if (LIBCXXABI_USE_LLVM_UNWINDER)
	add_definitions(-DLIBCXXABI_USE_LLVM_UNWINDER)			add_definitions(-DLIBCXXABI_USE_LLVM_UNWINDER)
	endif()			endif()
	▲ Show 20 Lines • Show All 82 Lines • Show Last 20 Lines

libcxxabi/trunk/src/cxa_demangle.cpp

	//===-------------------------- cxa_demangle.cpp --------------------------===//			//===-------------------------- cxa_demangle.cpp --------------------------===//
	//			//
	// The LLVM Compiler Infrastructure			// The LLVM Compiler Infrastructure
	//			//
	// This file is dual licensed under the MIT and the University of Illinois Open			// This file is dual licensed under the MIT and the University of Illinois Open
	// Source Licenses. See LICENSE.TXT for details.			// Source Licenses. See LICENSE.TXT for details.
	//			//
	//===----------------------------------------------------------------------===//			//===----------------------------------------------------------------------===//

	#define _LIBCPP_EXTERN_TEMPLATE(...)
	#define _LIBCPP_NO_EXCEPTIONS			#define _LIBCPP_NO_EXCEPTIONS

	#include "__cxxabi_config.h"			#include "__cxxabi_config.h"

	#include <vector>			#include <vector>
	#include <algorithm>			#include <algorithm>
	#include <string>			#include <string>
	#include <numeric>			#include <numeric>
	▲ Show 20 Lines • Show All 5,041 Lines • Show Last 20 Lines