[PATCH] D45304: [libcxx] Set ABI version 2 as default for Fuchsia
This revision was automatically updated to reflect the committed changes. Closed by commit rL329770: [libcxx] Set ABI version 2 as default for Fuchsia (authored by phosek, committed by ). Herald added a subscriber: llvm-commits. Changed prior to commit: https://reviews.llvm.org/D45304?vs=141935=141939#toc Repository: rL LLVM https://reviews.llvm.org/D45304 Files: libcxx/trunk/include/__config Index: libcxx/trunk/include/__config === --- libcxx/trunk/include/__config +++ libcxx/trunk/include/__config @@ -36,7 +36,11 @@ #define _LIBCPP_VERSION 7000 #ifndef _LIBCPP_ABI_VERSION -#define _LIBCPP_ABI_VERSION 1 +# ifdef __Fuchsia__ +#define _LIBCPP_ABI_VERSION 2 +# else +#define _LIBCPP_ABI_VERSION 1 +# endif #endif #if defined(__ELF__) Index: libcxx/trunk/include/__config === --- libcxx/trunk/include/__config +++ libcxx/trunk/include/__config @@ -36,7 +36,11 @@ #define _LIBCPP_VERSION 7000 #ifndef _LIBCPP_ABI_VERSION -#define _LIBCPP_ABI_VERSION 1 +# ifdef __Fuchsia__ +#define _LIBCPP_ABI_VERSION 2 +# else +#define _LIBCPP_ABI_VERSION 1 +# endif #endif #if defined(__ELF__) ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D45304: [libcxx] Set ABI version 2 as default for Fuchsia
phosek updated this revision to Diff 141935. phosek marked an inline comment as done. Repository: rCXX libc++ https://reviews.llvm.org/D45304 Files: libcxx/include/__config Index: libcxx/include/__config === --- libcxx/include/__config +++ libcxx/include/__config @@ -36,7 +36,11 @@ #define _LIBCPP_VERSION 7000 #ifndef _LIBCPP_ABI_VERSION -#define _LIBCPP_ABI_VERSION 1 +# ifdef __Fuchsia__ +#define _LIBCPP_ABI_VERSION 2 +# else +#define _LIBCPP_ABI_VERSION 1 +# endif #endif #if defined(__ELF__) Index: libcxx/include/__config === --- libcxx/include/__config +++ libcxx/include/__config @@ -36,7 +36,11 @@ #define _LIBCPP_VERSION 7000 #ifndef _LIBCPP_ABI_VERSION -#define _LIBCPP_ABI_VERSION 1 +# ifdef __Fuchsia__ +#define _LIBCPP_ABI_VERSION 2 +# else +#define _LIBCPP_ABI_VERSION 1 +# endif #endif #if defined(__ELF__) ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D45304: [libcxx] Set ABI version 2 as default for Fuchsia
EricWF accepted this revision. EricWF added a comment. This revision is now accepted and ready to land. LGTM. Comment at: libcxx/include/__config:39 #ifndef _LIBCPP_ABI_VERSION +#ifdef __Fuchsia__ +#define _LIBCPP_ABI_VERSION 2 Please indent these nested `#ifdef`s. Repository: rCXX libc++ https://reviews.llvm.org/D45304 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D45304: [libcxx] Set ABI version 2 as default for Fuchsia
phosek updated this revision to Diff 141933. phosek marked an inline comment as done. Repository: rCXX libc++ https://reviews.llvm.org/D45304 Files: libcxx/include/__config Index: libcxx/include/__config === --- libcxx/include/__config +++ libcxx/include/__config @@ -36,8 +36,12 @@ #define _LIBCPP_VERSION 7000 #ifndef _LIBCPP_ABI_VERSION +#ifdef __Fuchsia__ +#define _LIBCPP_ABI_VERSION 2 +#else #define _LIBCPP_ABI_VERSION 1 #endif +#endif #if defined(__ELF__) # define _LIBCPP_OBJECT_FORMAT_ELF 1 Index: libcxx/include/__config === --- libcxx/include/__config +++ libcxx/include/__config @@ -36,8 +36,12 @@ #define _LIBCPP_VERSION 7000 #ifndef _LIBCPP_ABI_VERSION +#ifdef __Fuchsia__ +#define _LIBCPP_ABI_VERSION 2 +#else #define _LIBCPP_ABI_VERSION 1 #endif +#endif #if defined(__ELF__) # define _LIBCPP_OBJECT_FORMAT_ELF 1 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D45304: [libcxx] Set ABI version 2 as default for Fuchsia
EricWF added inline comments. Comment at: libcxx/CMakeLists.txt:100 "LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY;LIBCXX_INSTALL_LIBRARY" OFF) -set(LIBCXX_ABI_VERSION 1 CACHE STRING "ABI version of libc++.") +if (FUCHSIA) + set(ABI_VERSION_DEFAULT 2) 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? Repository: rCXX libc++ https://reviews.llvm.org/D45304 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D45304: [libcxx] Set ABI version 2 as default for Fuchsia
phosek added a comment. I don't like this but I'm not sure if there's a better way to do this, do you have any ideas? Repository: rCXX libc++ https://reviews.llvm.org/D45304 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D45304: [libcxx] Set ABI version 2 as default for Fuchsia
phosek created this revision.
phosek added a reviewer: EricWF.
Herald added subscribers: cfe-commits, christof, mgorny.
phosek added a comment.
I don't like this but I'm not sure if there's a better way to do this, do you
have any ideas?
This avoids the need for a custom generated config file.
Repository:
rCXX libc++
https://reviews.llvm.org/D45304
Files:
libcxx/CMakeLists.txt
libcxx/include/__config
Index: libcxx/include/__config
===
--- libcxx/include/__config
+++ libcxx/include/__config
@@ -36,8 +36,12 @@
#define _LIBCPP_VERSION 7000
#ifndef _LIBCPP_ABI_VERSION
+#ifdef __Fuchsia__
+#define _LIBCPP_ABI_VERSION 2
+#else
#define _LIBCPP_ABI_VERSION 1
#endif
+#endif
#if defined(__ELF__)
# define _LIBCPP_OBJECT_FORMAT_ELF 1
Index: libcxx/CMakeLists.txt
===
--- libcxx/CMakeLists.txt
+++ libcxx/CMakeLists.txt
@@ -97,7 +97,12 @@
cmake_dependent_option(LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY
"Install libc++experimental.a" ON
"LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY;LIBCXX_INSTALL_LIBRARY" OFF)
-set(LIBCXX_ABI_VERSION 1 CACHE STRING "ABI version of libc++.")
+if (FUCHSIA)
+ set(ABI_VERSION_DEFAULT 2)
+else()
+ set(ABI_VERSION_DEFAULT 1)
+endif()
+set(LIBCXX_ABI_VERSION ${ABI_VERSION_DEFAULT} CACHE STRING "ABI version of
libc++.")
option(LIBCXX_ABI_UNSTABLE "Unstable ABI of libc++." OFF)
option(LIBCXX_ABI_FORCE_ITANIUM "Ignore auto-detection and force use of the
Itanium ABI.")
option(LIBCXX_ABI_FORCE_MICROSOFT "Ignore auto-detection and force use of the
Microsoft ABI.")
Index: libcxx/include/__config
===
--- libcxx/include/__config
+++ libcxx/include/__config
@@ -36,8 +36,12 @@
#define _LIBCPP_VERSION 7000
#ifndef _LIBCPP_ABI_VERSION
+#ifdef __Fuchsia__
+#define _LIBCPP_ABI_VERSION 2
+#else
#define _LIBCPP_ABI_VERSION 1
#endif
+#endif
#if defined(__ELF__)
# define _LIBCPP_OBJECT_FORMAT_ELF 1
Index: libcxx/CMakeLists.txt
===
--- libcxx/CMakeLists.txt
+++ libcxx/CMakeLists.txt
@@ -97,7 +97,12 @@
cmake_dependent_option(LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY
"Install libc++experimental.a" ON
"LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY;LIBCXX_INSTALL_LIBRARY" OFF)
-set(LIBCXX_ABI_VERSION 1 CACHE STRING "ABI version of libc++.")
+if (FUCHSIA)
+ set(ABI_VERSION_DEFAULT 2)
+else()
+ set(ABI_VERSION_DEFAULT 1)
+endif()
+set(LIBCXX_ABI_VERSION ${ABI_VERSION_DEFAULT} CACHE STRING "ABI version of libc++.")
option(LIBCXX_ABI_UNSTABLE "Unstable ABI of libc++." OFF)
option(LIBCXX_ABI_FORCE_ITANIUM "Ignore auto-detection and force use of the Itanium ABI.")
option(LIBCXX_ABI_FORCE_MICROSOFT "Ignore auto-detection and force use of the Microsoft ABI.")
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
