Skip to content
Snippets Groups Projects
Commit b0c39fc3 authored by Fons Rademakers's avatar Fons Rademakers
Browse files

add support for Intel icc v8.1, depricate support for v6 and v7. 

git-svn-id: http://root.cern.ch/svn/root/trunk@10095 27541ba8-7e3a-0410-8455-c3a389f83636
parent 80dea31d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
cint/Module.mk
+ 1
− 12
View file @ b0c39fc3
......@@ -137,7 +137,7 @@ ifeq ($(CXXCMD),icc)
CINTS2 := $(filter-out $(MODDIRS)/libstrm.%,$(CINTS2))
CINTS2 := $(filter-out $(MODDIRS)/longif.%,$(CINTS2))
ifeq ($(ICC_MAJOR),8)
ifeq ($(ICC_MINOR),1)
ifneq ($(ICC_MINOR),0)
CINTS2 += $(MODDIRS)/gcc3strm.cxx
else
CINTS2 += $(MODDIRS)/iccstrm.cxx
......@@ -147,12 +147,6 @@ CINTS2 += $(MODDIRS)/iccstrm.cxx
endif
CINTS2 += $(MODDIRS)/longif3.cxx
endif
ifeq ($(CXXCMD),ecc)
CINTS2 := $(filter-out $(MODDIRS)/libstrm.%,$(CINTS2))
CINTS2 := $(filter-out $(MODDIRS)/longif.%,$(CINTS2))
CINTS2 += $(MODDIRS)/iccstrm.cxx
CINTS2 += $(MODDIRS)/longif3.cxx
endif
ifeq ($(GCC_MAJOR),3)
CINTS2 := $(filter-out $(MODDIRS)/libstrm.%,$(CINTS2))
CINTS2 := $(filter-out $(MODDIRS)/longif.%,$(CINTS2))
......@@ -288,8 +282,3 @@ $(CINTDIRS)/loadfile_tmp.d: $(CINTDIRS)/loadfile.c $(RMKDEP)
@cp $(CINTDIRS)/loadfile.c $(CINTDIRS)/loadfile_tmp.c
$(MAKEDEP) $@ "$(CFLAGS)" $(CINTDIRS)/loadfile_tmp.c > $@
@rm -f $(CINTDIRS)/loadfile_tmp.c
ifeq ($(ICC_MAJOR),6)
$(CINTDIRS)/struct.o: $(CINTDIRS)/struct.c
$(CC) $(NOOPT) $(CINTCFLAGS) -o $@ -c $<
endif
config/Makefile.linuxia64ecc
+ 21
− 34
View file @ b0c39fc3
# -*- mode: makefile -*-
#
# Makefile of ROOT for Itanium/Linux with Intel icc compiler
# Makefile of ROOT for Itanium/Linux with Intel icc v8 compiler
PLATFORM = linux
......@@ -14,41 +14,35 @@ OPT = $(OPTFLAGS)
NOOPT = -O0
endif
# Compiler version:
ICC_MAJOR := $(shell ecc -quiet -V 2>&1 | awk '{ if (NR==2) print $$2 }' | \
cut -d'.' -f1)
ICC_MINOR := $(shell ecc -quiet -V 2>&1 | awk '{ if (NR==2) print $$2 }' | \
cut -d'.' -f2 | cut -d',' -f1)
ifeq ($(ICC_MAJOR),8)
ICC = icc
IFORT = ifort
else
ICC = ecc
IFORT = efc
endif
# Compiler:
CXX := $(ICC)
CC := $(ICC)
CXXFLAGS = -wd1476 $(EXTRA_CXXFLAGS)
CFLAGS = $(EXTRA_CFLAGS) -restrict
CINTCXXFLAGS = $(EXTRA_CXXFLAGS) \
CXX = icc
CC = icc
CXXFLAGS = -fPIC -wd1476 $(EXTRA_CXXFLAGS)
CFLAGS = -fPIC $(EXTRA_CFLAGS) -restrict
CINTCXXFLAGS = -fPIC $(EXTRA_CXXFLAGS) \
-DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
-DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__64BIT
CINTCFLAGS = $(EXTRA_CFLAGS) -restrict \
CINTCFLAGS = -fPIC $(EXTRA_CFLAGS) -restrict \
-DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
-DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__64BIT
# Compiler version:
ICC_MAJOR := $(shell $(CXX) -v 2>&1 | awk '{ if (NR==1) print $$2 }' | \
cut -d'.' -f1)
ICC_MINOR := $(shell $(CXX) -v 2>&1 | awk '{ if (NR==1) print $$2 }' | \
cut -d'.' -f2)
ifeq ($(ICC_MAJOR),8)
CXXFLAGS += -fPIC
CFLAGS += -fPIC
CINTCXXFLAGS += -fPIC
CINTCFLAGS += -fPIC
ifneq ($(ICC_MINOR),0)
CXXFLAGS += -wd1572
CFLAGS += -wd1572
CINTCXXFLAGS += -wd1572
CINTCFLAGS += -wd1572
endif
endif
# Linker:
LD := $(ICC)
LD = icpc
LDFLAGS = $(OPT) $(EXTRA_LDFLAGS)
SOFLAGS = -shared -Wl,-soname,
SOEXT = so
......@@ -60,22 +54,15 @@ CILIBS = -lm -ldl -rdynamic
CRYPTLIBS = -lcrypt
# Fortran:
F77 := $(IFORT)
F77 = ifort
F77FLAGS =
# check path for libg2c and libfrtbegin
LIBG2C := $(shell gcc -print-file-name=libg2c.a | \
awk '{ if ($$1 != "libg2c.a") print $$1}')
LIBFRTBEGIN := $(shell gcc -print-file-name=libfrtbegin.a | \
awk '{ if ($$1 != "libfrtbegin.a") print $$1}')
ifeq ($(ICC_MAJOR),8)
F77LIBS = $(LIBFRTBEGIN) $(LIBG2C) \
-L$(shell which ifort | sed -e 's|bin/ifort|lib|') \
-lifcore
else
F77LIBS = $(LIBFRTBEGIN) $(LIBG2C) \
-L$(shell which efc | sed -e 's|bin/efc|lib|') \
-lF90 -lCEPCF90 -lintrins
endif
# Extras
config/Makefile.linuxicc
+ 17
− 18
View file @ b0c39fc3
# -*- mode: makefile -*-
#
# Makefile of ROOT for Linux with glibc and Intel icc compiler
# Makefile of ROOT for Linux with glibc and Intel icc v8 compiler
PLATFORM = linux
......@@ -17,23 +17,32 @@ endif
# Compiler:
CXX = icc
CC = icc
CXXFLAGS = -wd1476 $(EXTRA_CXXFLAGS)
CFLAGS = $(EXTRA_CFLAGS) -restrict
CINTCXXFLAGS = $(EXTRA_CXXFLAGS) \
CXXFLAGS = -fPIC -wd1476 $(EXTRA_CXXFLAGS)
CFLAGS = -fPIC $(EXTRA_CFLAGS) -restrict
CINTCXXFLAGS = -fPIC $(EXTRA_CXXFLAGS) \
-DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
-DG__OSFDLL -DG__ROOT -DG__REDIRECTIO
CINTCFLAGS = $(EXTRA_CFLAGS) -restrict \
CINTCFLAGS = -fPIC $(EXTRA_CFLAGS) -restrict \
-DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
-DG__OSFDLL -DG__ROOT -DG__REDIRECTIO
# Compiler version:
ICC_MAJOR := $(shell $(CXX) -V 2>&1 | awk '{ if (NR==1) print $$8 }' | \
ICC_MAJOR := $(shell $(CXX) -v 2>&1 | awk '{ if (NR==1) print $$2 }' | \
cut -d'.' -f1)
ICC_MINOR := $(shell $(CXX) -V 2>&1 | awk '{ if (NR==1) print $$8 }' | \
ICC_MINOR := $(shell $(CXX) -v 2>&1 | awk '{ if (NR==1) print $$2 }' | \
cut -d'.' -f2)
ifeq ($(ICC_MAJOR),8)
ifneq ($(ICC_MINOR),0)
CXXFLAGS += -wd1572
CFLAGS += -wd1572
CINTCXXFLAGS += -wd1572
CINTCFLAGS += -wd1572
endif
endif
# Linker:
LD = icc
LD = icpc
LDFLAGS = $(OPT) $(EXTRA_LDFLAGS)
SOFLAGS = -shared -Wl,-soname,
SOEXT = so
......@@ -45,25 +54,15 @@ CILIBS = -lm -ldl -rdynamic
CRYPTLIBS = -lcrypt
# Fortran:
ifeq ($(ICC_MAJOR),8)
F77 = ifort
else
F77 = ifc
endif
F77FLAGS =
# check path for libg2c and libfrtbegin
LIBG2C := $(shell gcc -print-file-name=libg2c.a | \
awk '{ if ($$1 != "libg2c.a") print $$1}')
LIBFRTBEGIN := $(shell gcc -print-file-name=libfrtbegin.a | \
awk '{ if ($$1 != "libfrtbegin.a") print $$1}')
ifeq ($(ICC_MAJOR),8)
F77LIBS = $(LIBFRTBEGIN) $(LIBG2C) \
-L$(shell which ifort | sed -e 's|bin/ifort|lib|') \
-lifcore
else
F77LIBS = $(LIBFRTBEGIN) $(LIBG2C) \
-L$(shell which ifc | sed -e 's|bin/ifc|lib|') \
-lF90 -lCEPCF90 -lintrins
endif
# Extras
config/Makefile.linuxx8664icc
+ 1
− 11
View file @ b0c39fc3
# -*- mode: makefile -*-
#
# Makefile of ROOT for AMD Opteron and Intel EM64T (64 bit mode) Linux with icc
# Makefile of ROOT for AMD Opteron and Intel EM64T for Linux with icc v8
PLATFORM = linux
......@@ -45,25 +45,15 @@ CILIBS = -lm -ldl -rdynamic
CRYPTLIBS = -lcrypt
# Fortran:
ifeq ($(ICC_MAJOR),8)
F77 = ifort
else
F77 = ifc
endif
F77FLAGS =
# check path for libg2c and libfrtbegin
LIBG2C := $(shell gcc -print-file-name=libg2c.a | \
awk '{ if ($$1 != "libg2c.a") print $$1}')
LIBFRTBEGIN := $(shell gcc -print-file-name=libfrtbegin.a | \
awk '{ if ($$1 != "libfrtbegin.a") print $$1}')
ifeq ($(ICC_MAJOR),8)
F77LIBS = $(LIBFRTBEGIN) $(LIBG2C) \
-L$(shell which ifort | sed -e 's|bin/ifort|lib|') \
-lifcore
else
F77LIBS = $(LIBFRTBEGIN) $(LIBG2C) \
-L$(shell which ifc | sed -e 's|bin/ifc|lib|') \
-lF90 -lCEPCF90 -lintrins
endif
# Extras
test/Makefile.arch
+ 21
− 14
View file @ b0c39fc3
......@@ -278,11 +278,20 @@ endif
ifeq ($(ARCH),linuxicc)
# Linux with Intel icc compiler
ICC_MAJOR := $(shell icc -v 2>&1 | awk '{ if (NR==1) print $$2 }' | \
cut -d'.' -f1)
ICC_MINOR := $(shell icc -v 2>&1 | awk '{ if (NR==1) print $$2 }' | \
cut -d'.' -f2)
CXX = icc
CXXFLAGS = -O -wd1476
LD = icc
CXXFLAGS = -O -fPIC -wd1476
LD = icpc
LDFLAGS = -O
SOFLAGS = -shared
ifeq ($(ICC_MAJOR),8)
ifneq ($(ICC_MINOR),0)
CXXFLAGS += -wd1572
endif
endif
endif
ifeq ($(ARCH),linuxppcegcs)
......@@ -314,22 +323,20 @@ endif
ifeq ($(ARCH),linuxia64ecc)
# Itanium Linux with Intel icc (was ecc)
ICC_MAJOR := $(shell ecc -quiet -V 2>&1 | awk '{ if (NR==2) print $$2 }' | \
ICC_MAJOR := $(shell icc -v 2>&1 | awk '{ if (NR==1) print $$2 }' | \
cut -d'.' -f1)
ICC_MINOR := $(shell ecc -quiet -V 2>&1 | awk '{ if (NR==2) print $$2 }' | \
cut -d'.' -f2 | cut -d',' -f1)
ifeq ($(ICC_MAJOR),8)
ICC = icc
IFORT = ifort
else
ICC = ecc
IFORT = efc
endif
CXX = $(ICC)
ICC_MINOR := $(shell icc -v 2>&1 | awk '{ if (NR==1) print $$2 }' | \
cut -d'.' -f2)
CXX = icc
CXXFLAGS = -O -fPIC -wd1476
LD = $(ICC)
LD = icpc
LDFLAGS = -O
SOFLAGS = -shared
ifeq ($(ICC_MAJOR),8)
ifneq ($(ICC_MINOR),0)
CXXFLAGS += -wd1572
endif
endif
endif
ifeq ($(ARCH),linuxx8664gcc)
......
xrootd/src/xrootd-20040907-0403.src.tgz
+ 0
− 0
View file @ b0c39fc3
No preview for this file type
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment