Re: make-3.8

[Wendy Palm]

"Paul D. Smith" wrote:
> 
> %% Wendy Palm <address@hidden> writes:
> 
>   wp> i finally boiled the problem down a change made 2001-05-06
>   wp> to create a new macro MAKE_JOBSERVER.  this macro requires
>   wp> HAVE_SA_RESTART, which is not defined in cray's <signal.h>.
> 
> HAVE_SA_RESTART is not supposed to be defined in signal.h; it's defined
> by the configure script assuming that the system supports the POSIX
> SA_RESTART capability.

sorry, i phrased it slightly wrong.  you're right, it's not HAVE_SA_RESTART
but SA_RESTART that isn't in <signal.h>.  irregardless, CRAYs do not have
SA_RESTART capability, so it's not set.

>   wp> therefore, <fcntl.h> isn't included in main.c, and line 818 in
>   wp> main.c fails with O_CREAT, O_EXCL, O_WRONLY undefined.
>   wp> (HAVE_FDOPEN IS defined).  explicitly including <fcntl.h>
>   wp> compiles and tests correctly.
> 
> OK, I'll make that change, thanks.

thanks much.  here are a couple of other changes that should be made:

diff -ur make-3.80/configure make-3.80.new/configure
--- make-3.80/configure Thu Oct  3 13:18:48 2002
+++ make-3.80.new/configure     Tue Oct  8 14:52:28 2002
@@ -7346,7 +7346,7 @@
   cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 #include "confdefs.h"
-#if defined(CRAY) && ! defined(CRAY2)
+#ifdef _UNICOS
 webecray
 #else
 wenotbecray
diff -ur make-3.80/default.c make-3.80.new/default.c
--- make-3.80/default.c Sun Mar 26 00:56:54 2000
+++ make-3.80.new/default.c     Tue Oct  8 14:50:22 2002
@@ -401,13 +401,13 @@
     "COFLAGS", "",
 
     "CPP", "$(CC) -E",
-#ifdef CRAY
+#ifdef _UNICOS
     "CF77PPFLAGS", "-P",
     "CF77PP", "/lib/cpp",
     "CFT", "cft77",
     "CF", "cf77",
     "FC", "$(CF)",
-#else  /* Not CRAY.  */
+#else  /* Not _UNICOS.  */
 #ifdef _IBMR2
     "FC", "xlf",
 #else
@@ -434,12 +434,12 @@
 #ifdef pyr
     "PC", "pascal",
 #else
-#ifdef CRAY
+#ifdef _UNICOS
     "PC", "PASCAL",
     "SEGLDR", "segldr",
 #else
     "PC", "pc",
-#endif /* CRAY.  */
+#endif /* _UNICOS.  */
 #endif /* pyr.  */
 #ifdef GCC_IS_NATIVE
     "YACC", "bison -y",
diff -ur make-3.80/main.c make-3.80.new/main.c
--- make-3.80/main.c    Fri Aug  9 20:27:17 2002
+++ make-3.80.new/main.c        Tue Oct  8 14:30:16 2002
@@ -37,7 +37,7 @@
 #include <windows.h>
 #include "pathstuff.h"
 #endif
-#if defined(MAKE_JOBSERVER) && defined(HAVE_FCNTL_H)
+#if defined(MAKE_JOBSERVER) || defined(_UNICOS) && defined(HAVE_FCNTL_H)
 # include <fcntl.h>
 #endif
 
diff -ur make-3.80/make.h make-3.80.new/make.h
--- make-3.80/make.h    Wed Sep 11 11:55:44 2002
+++ make-3.80.new/make.h        Tue Oct  8 14:49:36 2002
@@ -56,7 +56,7 @@
 #define _GNU_SOURCE 1
 
 
-#ifdef  CRAY
+#ifdef _UNICOS
 /* This must happen before #include <signal.h> so
    that the declaration therein is changed.  */
 # define signal bsdsignal
============================

>   wp> also, alloca.c needs modifications.  i know many packages use
>   wp> this.  where should i send the changes (i.e. _CRAY is no longer
>   wp> correct, and CRAY2's no longer exist, etc.)
> 
> Good question.
> 
> I suggest sending any updates to the address@hidden mailing list.  If
> they don't know where it goes, at least a large number of the people
> using alloca.c probably read that list.

do the different packages share config.sub and config.guess files too?

there's a new Cray machine coming out, and i need to add it.
diff -ur make-3.80/config/config.guess make-3.80.new/config/config.guess
--- make-3.80/config/config.guess       Thu Oct  3 12:08:44 2002
+++ make-3.80.new/config/config.guess   Tue Oct  8 16:02:49 2002
@@ -729,6 +729,9 @@
     CRAY*SV1:*:*:*)
        echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
        exit 0 ;;
+    *:UNICOS/mp:*:*)
+       echo x1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+       exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
        FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 
'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 
'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
diff -ur make-3.80/config/config.sub make-3.80.new/config/config.sub
--- make-3.80/config/config.sub Thu Oct  3 12:08:44 2002
+++ make-3.80.new/config/config.sub     Tue Oct  8 16:01:57 2002
@@ -981,6 +981,10 @@
                basic_machine=i386-pc
                os=-windows32-msvcrt
                ;;
+       x1-cray*)
+               basic_machine=x1-cray
+               os=-unicosmp
+               ;;


-- 
wendy palm
Cray OS Sustaining Engineering, Cray Inc.
address@hidden, 651-605-9154