public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-8362] m2: Use time_t in time and don't redefine alloca
@ 2024-01-23 14:10 H.J. Lu
  0 siblings, 0 replies; only message in thread
From: H.J. Lu @ 2024-01-23 14:10 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:2bdf138a0d0141065fa9a8efa2ff86f211888a59

commit r14-8362-g2bdf138a0d0141065fa9a8efa2ff86f211888a59
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Tue Jan 23 05:55:07 2024 -0800

    m2: Use time_t in time and don't redefine alloca
    
    Fix the m2 build warning and error:
    
    [...]
    ../../src/gcc/m2/mc/mc.flex:32:9: warning: "alloca" redefined
       32 | #define alloca __builtin_alloca
          |         ^~~~~~
    In file included from /usr/include/stdlib.h:587,
                     from <stdout>:22:
    /usr/include/alloca.h:35:10: note: this is the location of the previous definition
       35 | # define alloca(size)   __builtin_alloca (size)
          |          ^~~~~~
    ../../src/gcc/m2/mc/mc.flex: In function 'handleDate':
    ../../src/gcc/m2/mc/mc.flex:333:25: error: passing argument 1 of 'time' from incompatible point
    er type [-Wincompatible-pointer-types]
      333 |   time_t  clock = time ((long *)0);
          |                         ^~~~~~~~~
          |                         |
          |                         long int *
    In file included from ../../src/gcc/m2/mc/mc.flex:28:
    /usr/include/time.h:76:29: note: expected 'time_t *' {aka 'long long int *'} but argument is of
     type 'long int *'
       76 | extern time_t time (time_t *__timer) __THROW;
    
            PR bootstrap/113554
            * mc/mc.flex (alloca): Don't redefine.
            (handleDate): Replace (long *)0 with (time_t *)0 when calling
            time.

Diff:
---
 gcc/m2/mc/mc.flex | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gcc/m2/mc/mc.flex b/gcc/m2/mc/mc.flex
index bd37d5ad100..7c841bf8d63 100644
--- a/gcc/m2/mc/mc.flex
+++ b/gcc/m2/mc/mc.flex
@@ -28,9 +28,11 @@ along with GNU Modula-2; see the file COPYING3.  If not see
 #include <time.h>
 #include <ctype.h>
 
+#ifndef alloca
 #ifdef __GNUC__
 #define alloca __builtin_alloca
 #endif
+#endif
 
 #if !defined(TRUE)
 #  define TRUE (1==1)
@@ -330,7 +332,7 @@ handleColumn (void)
 static void
 handleDate (void)
 {
-  time_t  clock = time ((long *)0);
+  time_t  clock = time ((time_t *)0);
   char   *sdate = ctime (&clock);
   char   *s     = (char *)alloca (strlen (sdate)+2+1);
   char   *p     = strchr(sdate, '\n');

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2024-01-23 14:10 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-23 14:10 [gcc r14-8362] m2: Use time_t in time and don't redefine alloca H.J. Lu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).