diff mbox series

[Ada] Fix bootstrap with old GCC

Message ID 20201021072334.GA73683@adacore.com
State New
Headers show
Series [Ada] Fix bootstrap with old GCC | expand

Commit Message

Pierre-Marie de Rodat Oct. 21, 2020, 7:23 a.m. UTC 
Some gcc versions (4 or less) support the __builtin_*_overflow
routines while corresponding g++ compilers do not.

Tested on x86_64-pc-linux-gnu, committed on trunk

gcc/ada/

	* adaint.c (__gnat_file_time): Use regular arithmetic instead of
	__builtin_*_overflow routines if GCC version 4 or less and
	compiler is g++.
diff mbox series

Patch

diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
--- a/gcc/ada/adaint.c
+++ b/gcc/ada/adaint.c
@@ -1503,6 +1503,9 @@  extern long long __gnat_file_time(char* name)
 
   t_write.ft_time = fad.ftLastWriteTime;
 
+#if defined(__GNUG__) && __GNUG__ <= 4
+  result = (t_write.ll_time - w32_epoch_offset) * 100;
+#else
   /* Next code similar to (t_write.ll_time - w32_epoch_offset) * 100
      but on overflow returns LLONG_MIN value. */
 
@@ -1513,6 +1516,7 @@  extern long long __gnat_file_time(char* name)
   if (__builtin_smulll_overflow(result, 100, &result)) {
     return LLONG_MIN;
   }
+#endif
 
 #else
 
@@ -1521,6 +1525,12 @@  extern long long __gnat_file_time(char* name)
     return LLONG_MIN;
   }
 
+#if defined(__GNUG__) && __GNUG__ <= 4
+    result = (sb.st_mtime - ada_epoch_offset) * 1E9;
+#if defined(st_mtime)
+    result += sb.st_mtim.tv_nsec;
+#endif
+#else
   /* Next code similar to
      (sb.st_mtime - ada_epoch_offset) * 1E9 + sb.st_mtim.tv_nsec
      but on overflow returns LLONG_MIN value. */
@@ -1538,7 +1548,7 @@  extern long long __gnat_file_time(char* name)
     return LLONG_MIN;
   }
 #endif
-
+#endif
 #endif
   return result;
 }