diff -uNr src.ORIG/config/MacOSX.cf src/config/MacOSX.cf --- src.ORIG/config/MacOSX.cf 2006-11-23 23:25:33.000000000 +0900 +++ src/config/MacOSX.cf 2008-03-27 15:49:46.000000000 +0900 @@ -117,8 +117,13 @@ #define CcCmd cc -arch "ppc" -no-cpp-precomp -ftree-vectorize #define CplusplusCmd c++ -no-cpp-precomp -ftree-vectorize #else +#if 0 #define CcCmd cc -ftree-vectorize #define CplusplusCmd c++ -ftree-vectorize +#else +#define CcCmd cc +#define CplusplusCmd c++ +#endif #endif #endif #ifndef CcCmd @@ -136,8 +141,12 @@ #define FortranCmd gfortran #define XargsCmd xargs #define FortranSaveFlags /* -fno-automatic */ /* Everything static !? */ +#if 0 #define OptimisedFortranFlags -O0 -g -funroll-loops -fomit-frame-pointer \ -ftree-vectorize +#else +#define OptimisedFortranFlags -O0 -g -funroll-loops -fomit-frame-pointer +#endif #define DefaultFCOptions -fno-second-underscore /*#define CernlibSystem -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX \ -DCERNLIB_PPC -DCERNLIB_QMGLIBC \ diff -uNr src.ORIG/mathlib/gen/c/algama.F src/mathlib/gen/c/algama.F --- src.ORIG/mathlib/gen/c/algama.F 1996-04-02 00:01:54.000000000 +0900 +++ src/mathlib/gen/c/algama.F 2008-03-27 15:46:27.000000000 +0900 @@ -10,6 +10,7 @@ #if (defined(CERNLIB_DOUBLE))&&(!defined(CERNLIB_IBM)) FUNCTION ALGAMA(X) DOUBLE PRECISION DLGAMA,D + EXTERNAL DLGAMA ENTRY ALOGAM(X) diff -uNr src.ORIG/mathlib/gen/c/alogam.F src/mathlib/gen/c/alogam.F --- src.ORIG/mathlib/gen/c/alogam.F 1996-04-02 00:01:54.000000000 +0900 +++ src/mathlib/gen/c/alogam.F 2008-03-27 15:46:27.000000000 +0900 @@ -9,6 +9,7 @@ #include "gen/pilot.h" #if (defined(CERNLIB_DOUBLE))&&(defined(CERNLIB_IBM)) FUNCTION ALOGAM(X) + EXTERNAL ALGAMA ALOGAM = ALGAMA(X) END #endif diff -uNr src.ORIG/mathlib/gen/c/dlogam.F src/mathlib/gen/c/dlogam.F --- src.ORIG/mathlib/gen/c/dlogam.F 1996-04-02 00:01:55.000000000 +0900 +++ src/mathlib/gen/c/dlogam.F 2008-03-27 15:46:27.000000000 +0900 @@ -10,6 +10,7 @@ #if defined(CERNLIB_IBM) FUNCTION DLOGAM(X) #include "gen/imp64.inc" + EXTERNAL DLGAMA DLOGAM = DLGAMA(X) END #endif diff -uNr src.ORIG/mathlib/gen/c/gagnc64.F src/mathlib/gen/c/gagnc64.F --- src.ORIG/mathlib/gen/c/gagnc64.F 1996-04-02 00:02:05.000000000 +0900 +++ src/mathlib/gen/c/gagnc64.F 2008-03-27 15:46:27.000000000 +0900 @@ -25,9 +25,11 @@ CHARACTER NAME*(*) CHARACTER*80 ERRTXT #if !defined(CERNLIB_DOUBLE) + EXTERNAL ALGAMA PARAMETER (NAME = 'RGAGNC') #endif #if defined(CERNLIB_DOUBLE) + EXTERNAL DLGAMA PARAMETER (NAME = 'RGAGNC/DGAGNC') #endif diff -uNr src.ORIG/mathlib/gen/c/gapnc64.F src/mathlib/gen/c/gapnc64.F --- src.ORIG/mathlib/gen/c/gapnc64.F 1996-04-02 00:02:05.000000000 +0900 +++ src/mathlib/gen/c/gapnc64.F 2008-03-27 15:46:27.000000000 +0900 @@ -24,9 +24,11 @@ CHARACTER NAME*(*) CHARACTER*80 ERRTXT #if !defined(CERNLIB_DOUBLE) + EXTERNAL ALGAMA PARAMETER (NAME = 'RGAPNC') #endif #if defined(CERNLIB_DOUBLE) + EXTERNAL DLGAMA PARAMETER (NAME = 'RGAPNC/DGAPNC') #endif PARAMETER (EPS = 5D-14) diff -uNr src.ORIG/mathlib/gen/tests/c209m.F src/mathlib/gen/tests/c209m.F --- src.ORIG/mathlib/gen/tests/c209m.F 1996-04-02 00:01:13.000000000 +0900 +++ src/mathlib/gen/tests/c209m.F 2008-03-27 15:46:27.000000000 +0900 @@ -16,7 +16,11 @@ #include "gen/defc64.inc" + TEST(NT,NT),A(0:NT),ROOT(NT),SUM C R is the estimated radius of a circle centered at a root +#if 0 DIMENSION R(NT),RES(NT) +#else + DIMENSION R(NT+1),RES(NT) +#endif LOGICAL INR2(NT,NT) PARAMETER (MAXFUN=50000) PARAMETER (TSTERR=5D-8) diff -uNr src.ORIG/mathlib/gen/tests/c310m.F src/mathlib/gen/tests/c310m.F --- src.ORIG/mathlib/gen/tests/c310m.F 1996-04-02 00:01:14.000000000 +0900 +++ src/mathlib/gen/tests/c310m.F 2008-03-27 15:46:27.000000000 +0900 @@ -50,9 +50,11 @@ #if defined(CERNLIB_DOUBLE) DIMENSION Y(7),T(7) REAL RT(7) + EXTERNAL DLGAMA #endif #if !defined(CERNLIB_DOUBLE) REAL Y(7),T(7) + EXTERNAL ALGAMA #endif DATA LTEST1/.TRUE./ diff -uNr src.ORIG/packlib/zebra/fq/fzdaeof.inc src/packlib/zebra/fq/fzdaeof.inc --- src.ORIG/packlib/zebra/fq/fzdaeof.inc 2006-09-15 18:35:31.000000000 +0900 +++ src/packlib/zebra/fq/fzdaeof.inc 2008-03-27 15:46:27.000000000 +0900 @@ -47,7 +47,11 @@ * only valid for dec fortran (e.g. not f2c + microsoft c) PARAMETER (IOSEOF = 36) #elif defined(CERNLIB_GFORTRAN) +#if __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) + PARAMETER (IOSEOF = 5002) +#else PARAMETER (IOSEOF = 3) +#endif #elif 1 PARAMETER (IOSEOF = -1) #endif diff -uNr src.ORIG/pawlib/paw/demo/higz_windows.dat src/pawlib/paw/demo/higz_windows.dat --- src.ORIG/pawlib/paw/demo/higz_windows.dat 2005-03-25 01:25:17.000000000 +0900 +++ src/pawlib/paw/demo/higz_windows.dat 2008-03-27 15:46:27.000000000 +0900 @@ -1,10 +1,10 @@ - 0000 0000 0600 0600 0.0 PAW tests - 0615 0000 0400 0400 0.0 PAW tests - 0000 0000 0600 0600 0.0 PAW tests - 0000 0000 0600 0600 0.0 PAW tests - 0000 0000 0600 0600 0.0 PAW tests - 0000 0000 0600 0600 0.0 PAW tests - 0000 0000 0600 0600 0.0 PAW tests - 0000 0000 0600 0600 0.0 PAW tests - 0000 0000 0600 0600 0.0 PAW tests - 0000 0000 0600 0600 0.0 PAW tests + 0000 0000 0600 0600 :0.0 PAW tests + 0615 0000 0400 0400 :0.0 PAW tests + 0000 0000 0600 0600 :0.0 PAW tests + 0000 0000 0600 0600 :0.0 PAW tests + 0000 0000 0600 0600 :0.0 PAW tests + 0000 0000 0600 0600 :0.0 PAW tests + 0000 0000 0600 0600 :0.0 PAW tests + 0000 0000 0600 0600 :0.0 PAW tests + 0000 0000 0600 0600 :0.0 PAW tests + 0000 0000 0600 0600 :0.0 PAW tests diff -uNr src.ORIG/scripts/cernlib src/scripts/cernlib --- src.ORIG/scripts/cernlib 2006-12-07 22:26:55.000000000 +0900 +++ src/scripts/cernlib 2008-03-27 15:46:27.000000000 +0900 @@ -117,7 +117,7 @@ [ `uname -m` = ppc ] && SYSGMOTIF="$SYSGMOTIF -lSM -lICE -lXpm" ;; Darwin) [ -d /usr/X11R6/lib ] && SYSGX11="-L/usr/X11R6/lib -lX11" - [ -d /usr/X11R6/lib ] && SYSGMOTIF="-L/usr/X11R6/lib -L`which fink | sed -e's?bin/fink?lib?'` -lXm -lXt -lXp -lXext -lX11 -lSM -lICE -lXpm" + [ -d /usr/X11R6/lib ] && SYSGMOTIF="-L/usr/X11R6/lib -lXm -lXt -lXp -lXext -lX11 -lSM -lICE -lXpm" ;; NeXT) SYSGX11="/usr/lib/X11/libX11.r" ; SYSGMOTIF="-lXm -lXt /usr/lib/X11/libX11.r" ;; diff -uNr src.ORIG/packlib/kuip/code_motif/kmfile.c src/packlib/kuip/code_motif/kmfile.c --- src.ORIG/packlib/kuip/code_motif/kmfile.c 2008-08-08 00:30:40.000000000 +0900 +++ src/packlib/kuip/code_motif/kmfile.c 2008-08-08 00:20:58.000000000 +0900 @@ -99,7 +99,7 @@ struct dirent *dp; char *pattern; #ifdef CERNLIB_MACOSX - regex_t *re; + regex_t *re = (regex_t *)malloc(sizeof(regex_t));; #else char *re; #endif diff -uNr src.ORIG/patchy/fcasplit.F src/patchy/fcasplit.F --- src.ORIG/patchy/fcasplit.F 1999-12-01 02:37:25.000000000 +0900 +++ src/patchy/fcasplit.F 2008-08-14 02:07:00.000000000 +0900 @@ -344,7 +344,11 @@ PARAMETER (CHOVER= 'UNKNOWN') PARAMETER (CHPOF = '-c -O -fno-automatic') +#if !defined(CERNLIB_PPC) PARAMETER (CHPOC = '-c -O2 -m486') +#else + PARAMETER (CHPOC = '-c -O2') +#endif PARAMETER (CHPOA = ' ') PARAMETER (CHEXFOR = '.f') @@ -352,7 +356,11 @@ PARAMETER (CHEXAS = '.s') PARAMETER (CHEXOBJ = '.o') +#if defined(CERNLIB_GFORTRAN) + PARAMETER (CHWHF = 'gfortran ') +#else PARAMETER (CHWHF = 'g77 ') +#endif PARAMETER (CHWHC = 'gcc ') PARAMETER (CHWHA = 'as ') #endif