[PATCH] libcody: Fix build for older GCC versions

[PATCH] libcody: Fix build for older GCC versions

[Jonathan Wakely]

[-- Attachment #1: Type: text/plain, Size: 721 bytes --]

Before CWG DR 1955 the controlling expression for an #elif must be
syntactically correct, meaning this won't compile with C++11 compilers
such as gcc 4.8:

The solution is to define __has_include(X) as 0 for compilers that don't
support it.

The second problem is that when <source_location> is found, it is used
without the std:: qualification.

libcody/ChangeLog:

	* internal.hh: Define fallback macros for __has_builtin and
	__has_include. Use __has_builtin for __builtin_FILE and
	__builtin_LINE. Define alias for std::source_location.

Built on GNu/Linux using both gcc-11 and gcc-4.8, and also by hacking
it so that __builtin_FILE and __builtin_LINE aren't found, and
<source_location> gets used.

OK for trunk?



[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 1687 bytes --]

commit 2c0f7be4ceb175714ede9ad7cbf364314bec2f4a
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Wed Dec 16 12:58:14 2020

    libcody: Fix build for older GCC versions
    
    Before CWG DR 1955 the controlling expression for an #elif must be
    syntactically correct, meaning this won't compile with C++11 compilers
    such as gcc 4.8:
    
    The solution is to define __has_include(X) as 0 for compilers that don't
    support it.
    
    The second problem is that when <source_location> is found, it is used
    without the std:: qualification.
    
    libcody/ChangeLog:
    
            * internal.hh: Define fallback macros for __has_builtin and
            __has_include. Use __has_builtin for __builtin_FILE and
            __builtin_LINE. Define alias for std::source_location.

diff --git a/libcody/internal.hh b/libcody/internal.hh
index d744b564cda..87673f56657 100644
--- a/libcody/internal.hh
+++ b/libcody/internal.hh
@@ -4,14 +4,23 @@
 
 #include "cody.hh"
 
+#ifndef __has_builtin
+#define __has_builtin(X) 0
+#endif
+#ifndef __has_include
+#define __has_include(X) 0
+#endif
+
 // C++
-#if __GNUC__ >= 10
+#if __has_builtin(__builtin_FILE) && __has_builtin(__builtin_LINE)
 #define CODY_LOC_BUILTIN 1
-#elif !defined (__has_include)
 #elif __has_include (<source_location>)
 #include <source_location>
+#ifdef __cpp_lib_source_location
 #define CODY_LOC_SOURCE 1
 #endif
+#endif
+
 // C
 #include <cstdio>
 
@@ -44,6 +53,8 @@ public:
   }
 
 #if !CODY_LOC_BUILTIN && CODY_LOC_SOURCE
+  using source_location = std::source_location;
+
   constexpr Location (source_location loc = source_location::current ())
     : Location (loc.file (), loc.line ())
   {

Re: [PATCH] libcody: Fix build for older GCC versions

[Nathan Sidwell]

On 12/16/20 8:05 AM, Jonathan Wakely wrote:
> Before CWG DR 1955 the controlling expression for an #elif must be
> syntactically correct, meaning this won't compile with C++11 compilers
> such as gcc 4.8:
> 
> The solution is to define __has_include(X) as 0 for compilers that don't
> support it.
> 
> The second problem is that when <source_location> is found, it is used
> without the std:: qualification.
> 
> libcody/ChangeLog:
> 
> 	* internal.hh: Define fallback macros for __has_builtin and
> 	__has_include. Use __has_builtin for __builtin_FILE and
> 	__builtin_LINE. Define alias for std::source_location.
> 
> Built on GNu/Linux using both gcc-11 and gcc-4.8, and also by hacking
> it so that __builtin_FILE and __builtin_LINE aren't found, and
> <source_location> gets used.
> 
> OK for trunk?

great, thanks!

nathan


-- 
Nathan Sidwell