Apply #308 to fix the GDB

pretty printer on Android toolchain.
ned14 · Nov 19, 2024 · 83e5127 · 83e5127
1 parent 954a054
commit 83e5127
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/include/outcome/detail/revision.hpp b/include/outcome/detail/revision.hpp
@@ -22,6 +22,6 @@ Distributed under the Boost Software License, Version 1.0.
 */
 
 // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
-#define OUTCOME_PREVIOUS_COMMIT_REF ebcd26750db46336e460d5e5de9448474a25854e
-#define OUTCOME_PREVIOUS_COMMIT_DATE "2024-11-06 01:20:54 +00:00"
-#define OUTCOME_PREVIOUS_COMMIT_UNIQUE ebcd2675
+#define OUTCOME_PREVIOUS_COMMIT_REF 954a054e50f2f121703a65aa6173a5d4f9748375
+#define OUTCOME_PREVIOUS_COMMIT_DATE "2024-11-10 23:34:00 +00:00"
+#define OUTCOME_PREVIOUS_COMMIT_UNIQUE 954a054e
diff --git a/include/outcome/experimental/status-code b/include/outcome/experimental/status-code
diff --git a/include/outcome/outcome_gdb.h b/include/outcome/outcome_gdb.h
@@ -27,12 +27,12 @@
 #define OUTCOME_INLINE_GDB_PRETTY_PRINTER_H
 
 #ifndef OUTCOME_DISABLE_INLINE_GDB_PRETTY_PRINTERS
-#if defined(__ELF__) && !defined(__ANDROID__)
+#if defined(__ELF__)
 #ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Woverlength-strings"
 #endif
-__asm__(".pushsection \".debug_gdb_scripts\", \"MS\",@progbits,1\n"
+__asm__(".pushsection \".debug_gdb_scripts\", \"MS\",%progbits,1\n"
         ".ascii \"\\4gdb.inlined-script.OUTCOME_INLINE_GDB_PRETTY_PRINTER_H\\n\"\n"
         ".ascii \"import gdb.printing\\n\"\n"
         ".ascii \"import os\\n\"\n"
@@ -156,7 +156,7 @@ __asm__(".pushsection \".debug_gdb_scripts\", \"MS\",@progbits,1\n"
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
-#endif // defined(__ELF__)
-#endif // !defined(OUTCOME_DISABLE_INLINE_GDB_PRETTY_PRINTERS)
+#endif  // defined(__ELF__)
+#endif  // !defined(OUTCOME_DISABLE_INLINE_GDB_PRETTY_PRINTERS)
 
-#endif // !defined(OUTCOME_INLINE_GDB_PRETTY_PRINTER_H)
+#endif  // !defined(OUTCOME_INLINE_GDB_PRETTY_PRINTER_H)
diff --git a/single-header/outcome-basic.hpp b/single-header/outcome-basic.hpp
@@ -767,7 +767,7 @@ extern "C" void _mm_pause();
 #endif
 #endif
 #ifndef QUICKCPPLIB_DISABLE_EXECINFO
-#if defined(__EMSCRIPTEN__)
+#if defined(__EMSCRIPTEN__) || defined(__ANDROID__)
 #define QUICKCPPLIB_DISABLE_EXECINFO 1
 #endif
 #endif
@@ -1019,9 +1019,9 @@ Distributed under the Boost Software License, Version 1.0.
           http://www.boost.org/LICENSE_1_0.txt)
 */
 // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
-#define OUTCOME_PREVIOUS_COMMIT_REF 84e9e394f800b73b5c4f4f901752998cd97aa767
-#define OUTCOME_PREVIOUS_COMMIT_DATE "2024-10-17 18:48:13 +00:00"
-#define OUTCOME_PREVIOUS_COMMIT_UNIQUE 84e9e394
+#define OUTCOME_PREVIOUS_COMMIT_REF 954a054e50f2f121703a65aa6173a5d4f9748375
+#define OUTCOME_PREVIOUS_COMMIT_DATE "2024-11-10 23:34:00 +00:00"
+#define OUTCOME_PREVIOUS_COMMIT_UNIQUE 954a054e
 #define OUTCOME_V2 (QUICKCPPLIB_BIND_NAMESPACE_VERSION(outcome_v2))
 #ifdef _DEBUG
 #define OUTCOME_V2_CXX_MODULE_NAME QUICKCPPLIB_BIND_NAMESPACE((QUICKCPPLIB_BIND_NAMESPACE_VERSION(outcome_v2d)))
@@ -3932,7 +3932,7 @@ OUTCOME_V2_NAMESPACE_END
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Woverlength-strings"
 #endif
-__asm__(".pushsection \".debug_gdb_scripts\", \"MS\",@progbits,1\n"
+__asm__(".pushsection \".debug_gdb_scripts\", \"MS\",%progbits,1\n"
         ".ascii \"\\4gdb.inlined-script.OUTCOME_INLINE_GDB_PRETTY_PRINTER_H\\n\"\n"
         ".ascii \"import gdb.printing\\n\"\n"
         ".ascii \"import os\\n\"\n"

diff --git a/single-header/outcome-experimental.hpp b/single-header/outcome-experimental.hpp
@@ -792,7 +792,7 @@ extern "C" void _mm_pause();
 #endif
 #endif
 #ifndef QUICKCPPLIB_DISABLE_EXECINFO
-#if defined(__EMSCRIPTEN__)
+#if defined(__EMSCRIPTEN__) || defined(__ANDROID__)
 #define QUICKCPPLIB_DISABLE_EXECINFO 1
 #endif
 #endif
@@ -1044,9 +1044,9 @@ Distributed under the Boost Software License, Version 1.0.
           http://www.boost.org/LICENSE_1_0.txt)
 */
 // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
-#define OUTCOME_PREVIOUS_COMMIT_REF 84e9e394f800b73b5c4f4f901752998cd97aa767
-#define OUTCOME_PREVIOUS_COMMIT_DATE "2024-10-17 18:48:13 +00:00"
-#define OUTCOME_PREVIOUS_COMMIT_UNIQUE 84e9e394
+#define OUTCOME_PREVIOUS_COMMIT_REF 954a054e50f2f121703a65aa6173a5d4f9748375
+#define OUTCOME_PREVIOUS_COMMIT_DATE "2024-11-10 23:34:00 +00:00"
+#define OUTCOME_PREVIOUS_COMMIT_UNIQUE 954a054e
 #define OUTCOME_V2 (QUICKCPPLIB_BIND_NAMESPACE_VERSION(outcome_v2))
 #ifdef _DEBUG
 #define OUTCOME_V2_CXX_MODULE_NAME QUICKCPPLIB_BIND_NAMESPACE((QUICKCPPLIB_BIND_NAMESPACE_VERSION(outcome_v2d)))
@@ -3957,7 +3957,7 @@ OUTCOME_V2_NAMESPACE_END
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Woverlength-strings"
 #endif
-__asm__(".pushsection \".debug_gdb_scripts\", \"MS\",@progbits,1\n"
+__asm__(".pushsection \".debug_gdb_scripts\", \"MS\",%progbits,1\n"
         ".ascii \"\\4gdb.inlined-script.OUTCOME_INLINE_GDB_PRETTY_PRINTER_H\\n\"\n"
         ".ascii \"import gdb.printing\\n\"\n"
         ".ascii \"import os\\n\"\n"
@@ -8132,7 +8132,7 @@ SYSTEM_ERROR2_NAMESPACE_END
 #pragma clang diagnostic ignored "-Woverlength-strings"
 #endif
 __asm__(
-".pushsection \".debug_gdb_scripts\", \"MS\",@progbits,1\n"
+".pushsection \".debug_gdb_scripts\", \"MS\",%progbits,1\n"
 ".ascii \"\\4gdb.inlined-script.SYSTEM_ERROR2_INLINE_GDB_PRETTY_PRINTERS_H\\n\"\n"
 ".ascii \"import gdb.printing\\n\"\n"
 ".ascii \"import gdb\\n\"\n"

diff --git a/single-header/outcome.hpp b/single-header/outcome.hpp
@@ -791,7 +791,7 @@ extern "C" void _mm_pause();
 #endif
 #endif
 #ifndef QUICKCPPLIB_DISABLE_EXECINFO
-#if defined(__EMSCRIPTEN__)
+#if defined(__EMSCRIPTEN__) || defined(__ANDROID__)
 #define QUICKCPPLIB_DISABLE_EXECINFO 1
 #endif
 #endif
@@ -1043,9 +1043,9 @@ Distributed under the Boost Software License, Version 1.0.
           http://www.boost.org/LICENSE_1_0.txt)
 */
 // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
-#define OUTCOME_PREVIOUS_COMMIT_REF 84e9e394f800b73b5c4f4f901752998cd97aa767
-#define OUTCOME_PREVIOUS_COMMIT_DATE "2024-10-17 18:48:13 +00:00"
-#define OUTCOME_PREVIOUS_COMMIT_UNIQUE 84e9e394
+#define OUTCOME_PREVIOUS_COMMIT_REF 954a054e50f2f121703a65aa6173a5d4f9748375
+#define OUTCOME_PREVIOUS_COMMIT_DATE "2024-11-10 23:34:00 +00:00"
+#define OUTCOME_PREVIOUS_COMMIT_UNIQUE 954a054e
 #define OUTCOME_V2 (QUICKCPPLIB_BIND_NAMESPACE_VERSION(outcome_v2))
 #ifdef _DEBUG
 #define OUTCOME_V2_CXX_MODULE_NAME QUICKCPPLIB_BIND_NAMESPACE((QUICKCPPLIB_BIND_NAMESPACE_VERSION(outcome_v2d)))
@@ -4869,7 +4869,7 @@ OUTCOME_V2_NAMESPACE_END
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Woverlength-strings"
 #endif
-__asm__(".pushsection \".debug_gdb_scripts\", \"MS\",@progbits,1\n"
+__asm__(".pushsection \".debug_gdb_scripts\", \"MS\",%progbits,1\n"
         ".ascii \"\\4gdb.inlined-script.OUTCOME_INLINE_GDB_PRETTY_PRINTER_H\\n\"\n"
         ".ascii \"import gdb.printing\\n\"\n"
         ".ascii \"import os\\n\"\n"