* libgfortran.h: Assume __GNUC__.

From-SVN: r212328

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index eef0b2885c71a74a5d3b01143d7f36574290ce97..773778ab2569142d0affd78b67d36c561dfa9aeb 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,7 @@
+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.

diff --git a/libgfortran/libgfortran.h b/libgfortran/libgfortran.h
index fa2fd83e7fa1f244b5a89498e655b733513f6bcf..dbc3f29cd60b27985c18ac2b4a170fc394672192 100644 (file)
--- a/libgfortran/libgfortran.h
+++ b/libgfortran/libgfortran.h
@@ -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. */