From d9f43611c2041ffa6a725b5dd91050a8b6147278 Mon Sep 17 00:00:00 2001 From: hristov Date: Tue, 3 Dec 2002 09:03:07 +0000 Subject: [PATCH] Changes needed on Itanium (F.Carminati) --- ALIROOT/aliroot.cxx | 5 ++- ALIROOT/fpu.c | 3 ++ ITS/AliITSRecPoint.cxx | 5 ++- ITS/AliITSgeomMatrix.cxx | 5 ++- ITS/AliITSgeomSDD.cxx | 11 ++++- ITS/AliITSgeomSPD.cxx | 14 +++++- ITS/AliITSgeomSSD.cxx | 14 +++++- ITS/AliITShit.cxx | 5 ++- MICROCERN/gen/pilot.h | 8 ++++ MICROCERN/kerngen/pilot.h | 9 ++++ MICROCERN/kernnum/pilot.h | 8 ++++ PYTHIA6/openDecayTable.F | 4 +- PYTHIA6/pythia6_common_block_address.F | 18 ++++++-- build/Makefile.Linux-ia64-ecc | 55 ++++++++++++++++++++++++ build/Makefile.Linux-ia64-gcc | 59 ++++++++++++++++++++++++++ 15 files changed, 210 insertions(+), 13 deletions(-) create mode 100644 build/Makefile.Linux-ia64-ecc create mode 100644 build/Makefile.Linux-ia64-gcc diff --git a/ALIROOT/aliroot.cxx b/ALIROOT/aliroot.cxx index 5520b39e4ed..7e3a67e01b0 100644 --- a/ALIROOT/aliroot.cxx +++ b/ALIROOT/aliroot.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.12 2002/10/14 14:55:33 hristov +Merging the VirtualMC branch to the main development branch (HEAD) + Revision 1.10.6.1 2002/08/28 15:06:49 alibrary Updating to v3-09-01 @@ -82,7 +85,7 @@ int xargc=0; extern "C" int __mb_cur_max=0; #endif -int gcbank_[4000000]; +//int gcbank_[4000000]; //_____________________________________________________________________________ int main(int argc, char **argv) diff --git a/ALIROOT/fpu.c b/ALIROOT/fpu.c index 88f4bc801eb..d4da3cbd61b 100644 --- a/ALIROOT/fpu.c +++ b/ALIROOT/fpu.c @@ -1,4 +1,6 @@ #ifdef __linux +#ifdef __ia64 +#else #include void __attribute__ ((constructor)) trapfpe () { @@ -6,6 +8,7 @@ void __attribute__ ((constructor)) _FPU_MASK_OM); _FPU_SETCW(cw); } +#endif #else void trapfpe () {} #endif diff --git a/ITS/AliITSRecPoint.cxx b/ITS/AliITSRecPoint.cxx index 44a30ff71ec..fab9a4edc92 100644 --- a/ITS/AliITSRecPoint.cxx +++ b/ITS/AliITSRecPoint.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.5 2002/10/14 14:57:00 hristov +Merging the VirtualMC branch to the main development branch (HEAD) + Revision 1.3.12.1 2002/10/14 13:14:08 hristov Updating VirtualMC to v3-09-02 @@ -49,7 +52,7 @@ void AliITSRecPoint::Print(ostream *os){ Int_t fmt; #endif #else -#if defined __ICC +#if defined __ICC || defined __ECC ios::fmtflags fmt; #else Int_t fmt; diff --git a/ITS/AliITSgeomMatrix.cxx b/ITS/AliITSgeomMatrix.cxx index 06273dd43d6..144eccc51d4 100644 --- a/ITS/AliITSgeomMatrix.cxx +++ b/ITS/AliITSgeomMatrix.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.17 2002/10/31 10:16:40 hristov +Minor corrections for warnings on Alpha + Revision 1.16 2002/10/22 14:45:40 alibrary Introducing Riostream.h @@ -709,7 +712,7 @@ void AliITSgeomMatrix::Print(ostream *os){ Int_t fmt; #endif #else -#if defined __ICC +#if defined __ICC || defined __ECC ios::fmtflags fmt; #else Int_t fmt; diff --git a/ITS/AliITSgeomSDD.cxx b/ITS/AliITSgeomSDD.cxx index 250e410e7d0..53d47feca2c 100644 --- a/ITS/AliITSgeomSDD.cxx +++ b/ITS/AliITSgeomSDD.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.18 2002/10/22 14:45:41 alibrary +Introducing Riostream.h + Revision 1.17 2002/10/14 14:57:00 hristov Merging the VirtualMC branch to the main development branch (HEAD) @@ -270,7 +273,7 @@ void AliITSgeomSDD::Print(ostream *os) const { Int_t fmt; #endif #else -#if defined __ICC +#if defined __ICC || defined __ECC ios::fmtflags fmt; #else Int_t fmt; @@ -339,6 +342,9 @@ istream &operator>>(istream &is,AliITSgeomSDD &r){ //====================================================================== /* $Log$ +Revision 1.18 2002/10/22 14:45:41 alibrary +Introducing Riostream.h + Revision 1.17 2002/10/14 14:57:00 hristov Merging the VirtualMC branch to the main development branch (HEAD) @@ -826,6 +832,9 @@ istream &operator>>(istream &is,AliITSgeomSDD256 &r){ //====================================================================== /* $Log$ +Revision 1.18 2002/10/22 14:45:41 alibrary +Introducing Riostream.h + Revision 1.17 2002/10/14 14:57:00 hristov Merging the VirtualMC branch to the main development branch (HEAD) diff --git a/ITS/AliITSgeomSPD.cxx b/ITS/AliITSgeomSPD.cxx index ab42545007d..a84292c73d8 100644 --- a/ITS/AliITSgeomSPD.cxx +++ b/ITS/AliITSgeomSPD.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.17 2002/10/22 14:45:41 alibrary +Introducing Riostream.h + Revision 1.16 2002/10/14 14:57:00 hristov Merging the VirtualMC branch to the main development branch (HEAD) @@ -202,7 +205,7 @@ void AliITSgeomSPD::Print(ostream *os) const { Int_t fmt; #endif #else -#if defined __ICC +#if defined __ICC || defined __ECC ios::fmtflags fmt; #else Int_t fmt; @@ -265,6 +268,9 @@ istream &operator>>(istream &is,AliITSgeomSPD &r){ /* $Log$ +Revision 1.17 2002/10/22 14:45:41 alibrary +Introducing Riostream.h + Revision 1.16 2002/10/14 14:57:00 hristov Merging the VirtualMC branch to the main development branch (HEAD) @@ -387,6 +393,9 @@ istream &operator>>(istream &is,AliITSgeomSPD300 &r){ //===================================================================== /* $Log$ +Revision 1.17 2002/10/22 14:45:41 alibrary +Introducing Riostream.h + Revision 1.16 2002/10/14 14:57:00 hristov Merging the VirtualMC branch to the main development branch (HEAD) @@ -539,6 +548,9 @@ istream &operator>>(istream &is,AliITSgeomSPD425Short &r){ /* $Log$ +Revision 1.17 2002/10/22 14:45:41 alibrary +Introducing Riostream.h + Revision 1.16 2002/10/14 14:57:00 hristov Merging the VirtualMC branch to the main development branch (HEAD) diff --git a/ITS/AliITSgeomSSD.cxx b/ITS/AliITSgeomSSD.cxx index 5848a7d81e8..e6d8381130a 100644 --- a/ITS/AliITSgeomSSD.cxx +++ b/ITS/AliITSgeomSSD.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.17 2002/10/22 14:45:41 alibrary +Introducing Riostream.h + Revision 1.16 2002/10/14 14:57:00 hristov Merging the VirtualMC branch to the main development branch (HEAD) @@ -239,7 +242,7 @@ void AliITSgeomSSD::Print(ostream *os) const { Int_t fmt; #endif #else -#if defined __ICC +#if defined __ICC || defined __ECC ios::fmtflags fmt; #else Int_t fmt; @@ -305,6 +308,9 @@ istream &operator>>(istream &is,AliITSgeomSSD &r){ //====================================================================== /* $Log$ +Revision 1.17 2002/10/22 14:45:41 alibrary +Introducing Riostream.h + Revision 1.16 2002/10/14 14:57:00 hristov Merging the VirtualMC branch to the main development branch (HEAD) @@ -398,6 +404,9 @@ istream &operator>>(istream &is,AliITSgeomSSD175 &r){ //====================================================================== /* $Log$ +Revision 1.17 2002/10/22 14:45:41 alibrary +Introducing Riostream.h + Revision 1.16 2002/10/14 14:57:00 hristov Merging the VirtualMC branch to the main development branch (HEAD) @@ -500,6 +509,9 @@ istream &operator>>(istream &is,AliITSgeomSSD275and75 &r){ //====================================================================== /* $Log$ +Revision 1.17 2002/10/22 14:45:41 alibrary +Introducing Riostream.h + Revision 1.16 2002/10/14 14:57:00 hristov Merging the VirtualMC branch to the main development branch (HEAD) diff --git a/ITS/AliITShit.cxx b/ITS/AliITShit.cxx index dcb357ab532..7554f001d99 100644 --- a/ITS/AliITShit.cxx +++ b/ITS/AliITShit.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.20 2002/10/22 14:45:42 alibrary +Introducing Riostream.h + Revision 1.19 2002/10/14 14:57:00 hristov Merging the VirtualMC branch to the main development branch (HEAD) @@ -608,7 +611,7 @@ void AliITShit::Print(ostream *os){ Int_t fmt; #endif #else -#if defined __ICC +#if defined __ICC || defined __ECC ios::fmtflags fmt; #else Int_t fmt; diff --git a/MICROCERN/gen/pilot.h b/MICROCERN/gen/pilot.h index 5e6ba216d58..8587c10e6ae 100644 --- a/MICROCERN/gen/pilot.h +++ b/MICROCERN/gen/pilot.h @@ -2,6 +2,14 @@ * define UNIX when LINUX defined +#if defined(CERNLIB_LXIA64) +* +* Take normal LINUX as basis for Itanium +#ifndef CERNLIB_LINUX +#define CERNLIB_LINUX +#endif +#endif + #if ((defined(CERNLIB_LINUX))||(defined (CERNLIB_SUN))) #ifndef CERNLIB_UNIX #define CERNLIB_UNIX diff --git a/MICROCERN/kerngen/pilot.h b/MICROCERN/kerngen/pilot.h index 3b870f7ed95..0e3b215998a 100644 --- a/MICROCERN/kerngen/pilot.h +++ b/MICROCERN/kerngen/pilot.h @@ -5,6 +5,15 @@ * Internal double-precision * copy vectors as floating normally #endif +#if defined(CERNLIB_LXIA64) +#if 0 +* +* Take normal LINUX as basis for Itanium +#endif +#ifndef CERNLIB_LINUX +#define CERNLIB_LINUX +#endif +#endif #if defined(CERNLIB_MSDOS) #include "kdos.h" #endif diff --git a/MICROCERN/kernnum/pilot.h b/MICROCERN/kernnum/pilot.h index 713a0fc83aa..da5982cfc32 100644 --- a/MICROCERN/kernnum/pilot.h +++ b/MICROCERN/kernnum/pilot.h @@ -1,3 +1,11 @@ +#if defined(CERNLIB_LXIA64) +* +* Take normal LINUX as basis for Itanium +#ifndef CERNLIB_LINUX +#define CERNLIB_LINUX +#endif +#endif + #if defined(CERNLIB_IBMRT) #ifndef CERNLIB_IBMRS #define CERNLIB_IBMRS diff --git a/PYTHIA6/openDecayTable.F b/PYTHIA6/openDecayTable.F index 0e91f32c38d..081c12de818 100644 --- a/PYTHIA6/openDecayTable.F +++ b/PYTHIA6/openDecayTable.F @@ -3,10 +3,10 @@ LOGICAL LRMSCH, LRD1O2, LTRASP INTEGER LUN CHARACTER*100 FILNAM -#if defined(CERNLIB_LINUX)||defined(CERNLIB_UNIX)||defined(CERNLIB_VAX)||defined(CERNLIB_CRAY) +#if defined(CERNLIB_LINUX)||defined(CERNLIB_UNIX)||defined(CERNLIB_VAX)||defined(CERNLIB_CRAY)||defined(CERNLIB_LXIA64) CHARACTER*100 CHROOT #endif -#if defined(CERNLIB_LINUX) || defined(CERNLIB_UNIX)||defined(CERNLIB_CRAY) +#if defined(CERNLIB_LINUX) || defined(CERNLIB_UNIX)||defined(CERNLIB_CRAY)||defined(CERNLIB_LXIA64) CHROOT=' ' CALL GETENVF('ALICE_ROOT',CHROOT) LNROOT = LNBLNK(CHROOT) diff --git a/PYTHIA6/pythia6_common_block_address.F b/PYTHIA6/pythia6_common_block_address.F index 4bfe45bc1be..5d468f6b9b6 100644 --- a/PYTHIA6/pythia6_common_block_address.F +++ b/PYTHIA6/pythia6_common_block_address.F @@ -1,4 +1,9 @@ - integer function pythia6_common_block_address(common_block_name) +#ifdef __ia64 + integer*8 +#else + integer +#endif + + function pythia6_common_block_address(common_block_name) c----------------------------------------------------------------------- c revision history: c ----------------- @@ -12,11 +17,16 @@ c external pydata c c----------------------------------------------------------------------- - integer pythia6_addressc, pythia6_addressi - integer pythia6_addressd, pythia6_addressf +#ifdef __ia64 + integer*8 +#else + integer +#endif + + pythia6_addressc, pythia6_addressi, + + pythia6_addressd, pythia6_addressf, + + common_block_address external pythia6_addressc, pythia6_addressi external pythia6_addressd, pythia6_addressf - integer common_block_address c----------------------------------------------------------------------- common_block_address = 0 c----------------------------------------------------------------------- diff --git a/build/Makefile.Linux-ia64-ecc b/build/Makefile.Linux-ia64-ecc new file mode 100644 index 00000000000..538ba57290b --- /dev/null +++ b/build/Makefile.Linux-ia64-ecc @@ -0,0 +1,55 @@ +PLATFORM:=linuxicc + +# The compilers +CXX = ecc +F77 = efc +CC = ecc + +# Global optimisation +OPT = -g #-O + +CXXOPTS = $(OPT) +COPT = $(OPT) +FOPT = $(OPT) +CXXFLAGS = $(CXXOPTS) +CFLAGS = $(COPT) + +# rootcint flags +CINTFLAGS = #$(CXXFLAGS) + +# CERNLIB defines + +CLIBDEFS = -DCERNLIB_LXIA64 -DCERNLIB_BLDLIB -DCERNLIB_CZ +CLIBCXXOPTS = +CLIBCOPT = +CLIBFOPT = + +# Common Fortran compilation flags +FFLAGS = $(CLIBFOPT) $(CLIBDEFS) $(FOPT) + +LD = ecc +LDFLAGS = $(OPT) + +SHLD = $(LD) +SOFLAGS = -Wl,-soname,$(notdir $@) -shared -O +SHLIB = +SOEXT = so + +ALLD = ar +ALFLAGS = cr +ALLIB = +AEXT = a + +# additional ROOT libraries +ROOTLIBS += -lcrypt + +# rmkdepend flags for building dependencies of FORTRAN files +DEPENDFFLAGS = $(FFLAGS) + +LIBNOVER = `find /lib -name 'libNoVersion*.so' | xargs --replace basename {} .so | sed -e 's/lib/ -l/'` +GLIBS = $(LIBNOVER) + +#System libraries +SYSLIBS = + +EXEFLAGS+= -L/usr/local/lib -lXt -lCEPCF90 -lF90 -lPEPCF90 -lintrins diff --git a/build/Makefile.Linux-ia64-gcc b/build/Makefile.Linux-ia64-gcc new file mode 100644 index 00000000000..f1057b6e864 --- /dev/null +++ b/build/Makefile.Linux-ia64-gcc @@ -0,0 +1,59 @@ +PLATFORM:=linux + +# The compilers +CXX = g++ +F77 = g77 +CC = gcc + +# Global optimisation +OPT = -g #-O + +CXXOPTS = $(OPT) -Wall -fPIC -pipe +COPT = $(OPT) +FOPT = $(OPT) -fno-second-underscore +CXXFLAGS = $(CXXOPTS) +CFLAGS = -Wall -fPIC -pipe + +# rootcint flags +CINTFLAGS = #$(CXXFLAGS) + +# CERNLIB defines + +CLIBDEFS = -DCERNLIB_LXIA64 -DCERNLIB_BLDLIB -DCERNLIB_CZ +CLIBCXXOPTS = +CLIBCOPT = +CLIBFOPT = + +# Common Fortran compilation flags +FFLAGS = $(CLIBFOPT) $(CLIBDEFS) $(FOPT) + +LD = g++ +LDFLAGS = $(OPT) -Wl,-Map -Wl,$@.map + +SHLD = $(LD) +SOFLAGS = -shared -Wl #-O2 +#SHLIB = -lg2c +SOEXT = so + +ALLD = ar +ALFLAGS = cr +ALLIB = +AEXT = a + +# additional ROOT libraries +ROOTLIBS += -lcrypt + +# rmkdepend flags for building dependencies of FORTRAN files +DEPENDFFLAGS = $(FFLAGS) + +LIBNOVER = `find /lib -name 'libNoVersion*.so' | xargs --replace basename {} .so | sed -e 's/lib/ -l/'` +GLIBS = -L/usr/X11R6/lib -lX11 $(LIBNOVER) + +#System libraries +SYSLIBS = -ldl -lbsd + +EXEFLAGS+= -lg2c + + + + -- 2.39.3