Re: [fortran, patch] IEEE intrinsic modules (ping)

[FX <fxcoudert@gmail.com>]

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

> Right, that's what I (vaguelly) remembered. Please consider a patch
> removing the ifndef __GNUC__ stuff from libgfortran.h pre-approved.

The only occurrence (outside of libcaf) is in libgfortran.h. Committed attached patch as rev. 212328, after building on x86_64-linux.

FX



[-- Attachment #2: x --]
[-- Type: application/octet-stream, Size: 1030 bytes --]

Index: libgfortran.h
===================================================================
--- libgfortran.h	(revision 212327)
+++ libgfortran.h	(working copy)
@@ -107,14 +107,8 @@ typedef off_t gfc_offset;
    heuristic will mark this branch as much less likely as unlikely() would
    do.  */
 
-#ifndef __GNUC__
-#define __attribute__(x)
-#define likely(x)       (x)
-#define unlikely(x)     (x)
-#else
 #define likely(x)       __builtin_expect(!!(x), 1)
 #define unlikely(x)     __builtin_expect(!!(x), 0)
-#endif
 
 
 /* Make sure we have ptrdiff_t. */
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 212327)
+++ ChangeLog	(working copy)
@@ -1,5 +1,9 @@
 2014-07-07  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
+	* libgfortran.h: Assume __GNUC__.
+
+2014-07-07  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
 	* runtime/stop.c: Use C11 _Noreturn.
 	* libgfortran.h: Use C11 _Noreturn in prototypes.
 	Move REALPART, IMAGPART and COMPLEX_ASSIGN macros...