From e22fdcea863dbf82ecfc2ba8c36352a0f676aa05 Mon Sep 17 00:00:00 2001 From: hristov Date: Sun, 19 May 2002 18:09:23 +0000 Subject: [PATCH 1/1] Changes needed by ICC/IFC compiler (Intel) --- MINICERN/Makefile | 26 ++++++++++++++------------ MINICERN/packlib/zebra/dzebra/dzare1.F | 13 +++++++++---- MINICERN/packlib/zebra/dzebra/dzbkhd.F | 11 ++++++++++- MINICERN/packlib/zebra/dzebra/dzmap.F | 12 ++++++++---- PDF/Makefile | 8 ++++---- 5 files changed, 45 insertions(+), 25 deletions(-) diff --git a/MINICERN/Makefile b/MINICERN/Makefile index e82c865a242..94f8f860a1c 100644 --- a/MINICERN/Makefile +++ b/MINICERN/Makefile @@ -9,27 +9,30 @@ PACKAGE = minicern INC = -Ipacklib/zebra \ -Ipacklib/kernlib/kerngen \ - -Imathlib/gen \ - -Ipacklib/kernlib/kernnum + -Imathlib/gen \ + -Ipacklib/kernlib/kernnum \ + -Ipacklib/kernlib/kerngen/kerngen + - # C++ compilation flags CXXFLAGS = $(CXXOPTS) $(CLIBCXXOPTS) $(INC) $(CLIBDEFS) - + # C compilation flags CFLAGS = $(COPT) $(CLIBCOPT) $(INC) $(CLIBDEFS) - + # FORTRAN compilation flags FFLAGS = $(FOPT) $(CLIBFOPT) $(INC) $(CLIBDEFS) - + FSRCS = dummies.F hbcdf.F fzdummies.F \ mathlib/gen/b/atg.F \ mathlib/gen/c/gamma.F \ mathlib/gen/c/gamma128.F \ mathlib/gen/c/gamma64.F \ + mathlib/gen/c/erf64.F \ + mathlib/gen/c/erf128.F \ mathlib/gen/d/gauss.F \ mathlib/gen/d/gauss128.F \ mathlib/gen/d/gauss64.F \ @@ -221,8 +224,7 @@ FSRCS = dummies.F hbcdf.F fzdummies.F \ packlib/zebra/rz/rzver2.F \ packlib/zebra/rz/rzveri.F \ packlib/zebra/rz/rzwrt.F \ - - + ifeq ($(PLATFORM),linux) FSRC = $(FSRCS) \ packlib/kernlib/kerngen/unix/lnxgs/rdmin.F @@ -254,8 +256,8 @@ CSRCS = \ packlib/kernlib/kerngen/ccgencf/cfstati.c \ packlib/kernlib/kerngen/ccgenu/fchput.c \ packlib/kernlib/kerngen/ccgenu/fchtak.c \ - packlib/kernlib/kerngen/ccgen/datime.c \ - + packlib/kernlib/kerngen/ccgen/datime.c \ + ifeq ($(PLATFORM),linux) CSRC = $(CSRCS) \ packlib/kernlib/kerngen/unix/lnxgs/ishftr.c @@ -271,7 +273,7 @@ endif ifeq ($(PLATFORM),alpha) CSRC = $(CSRCS) endif - + CXXSRC = @@ -283,7 +285,7 @@ SRCS = $(FSRC) $(CSRC) $(CXXSRC) OBJS = $(FOBJ) $(COBJ) $(CXXOBJ) ##### TARGETS ##### - + # Target SLIBRARY = $(LIBDIR)/libminicern.$(SL) diff --git a/MINICERN/packlib/zebra/dzebra/dzare1.F b/MINICERN/packlib/zebra/dzebra/dzare1.F index 22674b77263..17f7f452018 100644 --- a/MINICERN/packlib/zebra/dzebra/dzare1.F +++ b/MINICERN/packlib/zebra/dzebra/dzare1.F @@ -2,6 +2,9 @@ * $Id$ * * $Log$ +* Revision 1.1.1.1 1999/05/18 15:55:22 fca +* AliRoot sources +* * Revision 1.2 1996/04/24 17:26:00 mclareni * Extend the include file cleanup to dzebra, rz and tq, and also add * dependencies in some cases. @@ -168,15 +171,17 @@ ENDIF CQMAP(1) = ' ' - WRITE(CQMAP(2), #if !defined(CERNLIB_OCTMAP) + WRITE(CQMAP(2), W '('' This '',A9,'' LINK AREA is at absolute address '',Z8, -#endif -#if defined(CERNLIB_OCTMAP) + W '' with NL/NS ='',I7,''/'',I7,4X,'' and is '',A8)' ) + W CLATYP(JTEMP),(LLAAR1+LQSTOR) +#else + WRITE(CQMAP(2), W '('' This '',A9,'' LINK AREA is at absolute address '',O11, -#endif W '' with NL/NS ='',I7,''/'',I7,4X,'' and is '',A8)' ) W CLATYP(JTEMP),(LLAAR1+LQSTOR) +#endif #if !defined(CERNLIB_WORDMAP) W *4 #endif diff --git a/MINICERN/packlib/zebra/dzebra/dzbkhd.F b/MINICERN/packlib/zebra/dzebra/dzbkhd.F index 0c612cf7bf5..dd867a848cf 100644 --- a/MINICERN/packlib/zebra/dzebra/dzbkhd.F +++ b/MINICERN/packlib/zebra/dzebra/dzbkhd.F @@ -2,6 +2,9 @@ * $Id$ * * $Log$ +* Revision 1.1.1.1 1999/05/18 15:55:22 fca +* AliRoot sources +* * Revision 1.2 1996/04/24 17:26:02 mclareni * Extend the include file cleanup to dzebra, rz and tq, and also add * dependencies in some cases. @@ -69,16 +72,22 @@ ENDIF +#if (!defined(CERNLIB_QMIBM))&&(!defined(CERNLIB_QMVAX)) WRITE(CQLINE, W '(1X,A1,A4,''.'',I6,I9,''('',A ,'') SY/US/IO '',Z4,''/'',Z5, W ''/'',Z4,'' NL/NS/ND'',I5,''/'',I5,''/'',I8,'' N/U/O/@O'', -#if (!defined(CERNLIB_QMIBM))&&(!defined(CERNLIB_QMVAX)) W I8,''/'',I8,''/'',I8,''/'',A)', ERR=999) #endif #if defined(CERNLIB_QMVAX) + WRITE(CQLINE, + W '(1X,A1,A4,''.'',I6,I9,''('',A ,'') SY/US/IO '',Z4,''/'',Z5, + W ''/'',Z4,'' NL/NS/ND'',I5,''/'',I5,''/'',I8,'' N/U/O/@O'', W I8,''/'',I8,''/'',I8,''/'',A)', IOSTAT=ISTAT) #endif #if defined(CERNLIB_QMIBM) + WRITE(CQLINE, + W '(1X,A1,A4,''.'',I6,I9,''('',A ,'') SY/US/IO '',Z4,''/'',Z5, + W ''/'',Z4,'' NL/NS/ND'',I5,''/'',I5,''/'',I8,'' N/U/O/@O'', W I8,''/'',I8,''/'',I8,''/'',A)') #endif W CLIVE, IQWIDH(KQS+LS),IQWIDN(KQS+LS),LS,CQDIV, diff --git a/MINICERN/packlib/zebra/dzebra/dzmap.F b/MINICERN/packlib/zebra/dzebra/dzmap.F index 1f4cafc18c2..2d55d752668 100644 --- a/MINICERN/packlib/zebra/dzebra/dzmap.F +++ b/MINICERN/packlib/zebra/dzebra/dzmap.F @@ -2,6 +2,9 @@ * $Id$ * * $Log$ +* Revision 1.1.1.1 1999/05/18 15:55:22 fca +* AliRoot sources +* * Revision 1.2 1996/04/24 17:26:12 mclareni * Extend the include file cleanup to dzebra, rz and tq, and also add * dependencies in some cases. @@ -63,14 +66,15 @@ IF (IQND.LT.0) THEN IF (IFLOPT(MPOSHQ).NE.0) THEN - WRITE(CQLINE, #if !defined(CERNLIB_OCTMAP) + WRITE(CQLINE, W '(1X,''(*HO*'',1X,I8,''('',Z8, -#endif -#if defined(CERNLIB_OCTMAP) + W '') -- HOLE of '',I8,'' words'')') IQLN,(IQLN+LQSTOR) +#else + WRITE(CQLINE, W '(1X,''(*HO*'',1X,I8,''('',O8, -#endif W '') -- HOLE of '',I8,'' words'')') IQLN,(IQLN+LQSTOR) +#endif * MAP addresses are in BYTES #if !defined(CERNLIB_WORDMAP) W *4 diff --git a/PDF/Makefile b/PDF/Makefile index bc7c3c6e401..83d40dde42b 100644 --- a/PDF/Makefile +++ b/PDF/Makefile @@ -23,15 +23,15 @@ OBJS = $(FOBJS) # C++ compilation flags CXXFLAGS = $(CXXOPTS) $(CLIBCXXOPTS) $(CLIBDEFS) -I. - + # C compilation flags CFLAGS = $(COPT) $(CLIBCOPT) $(CLIBDEFS) -I. - + # FORTRAN compilation flags -FFLAGS = $(FOPT) $(CLIBFOPT) $(CLIBDEFS) -DCERNLIB_DOUBLE -I. - +FFLAGS = $(FOPT) $(CLIBFOPT) $(CLIBDEFS) -DCERNLIB_DOUBLE -I. -Ipdf + # Target SLIBRARY = $(LIBDIR)/libpdf.$(SL) -- 2.39.3