This is an archive of the discontinued LLVM Phabricator instance.

Differential D45304

[libcxx] Set ABI version 2 as default for Fuchsia
ClosedPublic

Authored by phosek on Apr 4 2018, 5:09 PM.

Details

Reviewers
EricWF
Commits
rG2b3846306d4e: [libcxx] Set ABI version 2 as default for Fuchsia
rCXX329770: [libcxx] Set ABI version 2 as default for Fuchsia
rL329770: [libcxx] Set ABI version 2 as default for Fuchsia
Summary

This avoids the need for a custom generated config file which is desired because the custom config files differs per-target which means we cannot reuse headers across different targets.

Diff Detail

Repository
rL LLVM

Event Timeline

phosek created this revision.Apr 4 2018, 5:09 PM
Herald added subscribers: cfe-commits, christof, mgorny. · View Herald TranscriptApr 4 2018, 5:09 PM
phosek added a comment.Apr 4 2018, 5:09 PM

I don't like this but I'm not sure if there's a better way to do this, do you have any ideas?

phosek edited the summary of this revision. (Show Details)Apr 10 2018, 4:31 PM
EricWF added inline comments.Apr 10 2018, 4:57 PM
libcxx/CMakeLists.txt
100 ↗(On Diff #141091)

I don't think this part of the change is needed. Won't setting ABI_VERSION_DEFAULT to 2 result in a site config header being generated?

phosek updated this revision to Diff 141933.Apr 10 2018, 5:16 PM
phosek marked an inline comment as done.
EricWF accepted this revision.Apr 10 2018, 5:21 PM

LGTM.

libcxx/include/__config
39 ↗(On Diff #141933)

Please indent these nested #ifdefs.

This revision is now accepted and ready to land.Apr 10 2018, 5:21 PM
phosek updated this revision to Diff 141935.Apr 10 2018, 5:31 PM
phosek marked an inline comment as done.
Closed by commit rL329770: [libcxx] Set ABI version 2 as default for Fuchsia (authored by phosek). · Explain WhyApr 10 2018, 6:09 PM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptApr 10 2018, 6:09 PM
phosek mentioned this in D45529: [CMake] Set the default ABI version for Fuchsia in CMake as well.Apr 12 2018, 2:17 PM

Revision Contents

PathSize
libcxx/
trunk/
include/
6 lines

Diff 141939

libcxx/trunk/include/__config

Show All 30 Lines
#else #else
# define _GNUC_VER 0 # define _GNUC_VER 0
# define _GNUC_VER_NEW 0 # define _GNUC_VER_NEW 0
#endif #endif
#define _LIBCPP_VERSION 7000 #define _LIBCPP_VERSION 7000
#ifndef _LIBCPP_ABI_VERSION #ifndef _LIBCPP_ABI_VERSION
# ifdef __Fuchsia__
# define _LIBCPP_ABI_VERSION 2
# else
#define _LIBCPP_ABI_VERSION 1 # define _LIBCPP_ABI_VERSION 1
#endif # endif
#endif
#if defined(__ELF__) #if defined(__ELF__)
# define _LIBCPP_OBJECT_FORMAT_ELF 1 # define _LIBCPP_OBJECT_FORMAT_ELF 1
#elif defined(__MACH__) #elif defined(__MACH__)
# define _LIBCPP_OBJECT_FORMAT_MACHO 1 # define _LIBCPP_OBJECT_FORMAT_MACHO 1
#elif defined(_WIN32) #elif defined(_WIN32)
# define _LIBCPP_OBJECT_FORMAT_COFF 1 # define _LIBCPP_OBJECT_FORMAT_COFF 1
#elif defined(__wasm__) #elif defined(__wasm__)
▲ Show 20 Lines • Show All 1,276 Lines • Show Last 20 Lines