]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libstdc++: Only use __builtin_sprintf if supported [PR 96083]
authorJonathan Wakely <jwakely@redhat.com>
Wed, 16 Dec 2020 13:50:34 +0000 (13:50 +0000)
committerJonathan Wakely <jwakely@redhat.com>
Mon, 11 Jan 2021 15:03:35 +0000 (15:03 +0000)
Clang doesn't support __builtin_sprintf, so use std::sprintf instead.

libstdc++-v3/ChangeLog:

PR libstdc++/96083
* include/ext/throw_allocator.h: Use __has_builtin to check for
__builtin_sprintf support, and use std::sprintf if necessary.

(cherry picked from commit 96d9670e88333d8896a5d2f2bb0403c1e2ad19ab)

libstdc++-v3/include/ext/throw_allocator.h

index f99b26b0cf122fba8dca05a96d5c0d2008e8020f..cab4c0e5ee214c9db0562925b4ab881ad1b4c0f6 100644 (file)
 #endif
 #include <ext/alloc_traits.h>
 
+#if !__has_builtin(__builtin_sprintf)
+# include <cstdio>
+#endif
+
 namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
@@ -310,6 +314,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     static void
     log_to_string(std::string& s, const_reference ref)
     {
+#if ! __has_builtin(__builtin_sprintf)
+      __typeof__(&std::sprintf) __builtin_sprintf = &std::sprintf;
+#endif
+
       char buf[40];
       const char tab('\t');
       s += "label: ";
@@ -332,6 +340,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     static void
     log_to_string(std::string& s, const std::pair<const void*, size_t>& ref)
     {
+#if ! __has_builtin(__builtin_sprintf)
+      auto __builtin_sprintf = &std::sprintf;
+#endif
+
       char buf[40];
       const char tab('\t');
       s += "label: ";
@@ -566,6 +578,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       static gen_t generator(engine(), distribution);
 #endif
 
+#if ! __has_builtin(__builtin_sprintf)
+      __typeof__(&std::sprintf) __builtin_sprintf = &std::sprintf;
+#endif
+
       double random = generator();
       if (random < distribution.min() || random > distribution.max())
        {