diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-02-27 15:21:14 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-02-27 15:21:14 +0000 |
| commit | 254ddad857deb390df2d91f17fe39cf7369611f3 (patch) | |
| tree | 612af7fd9c3d1f94dd06d961c5605b115416c514 | |
| parent | a81986a786a6dbe0878a27a7787840e8cdc1bd08 (diff) | |
| download | ATCD-254ddad857deb390df2d91f17fe39cf7369611f3.tar.gz | |
ChangeLogTag: Thu Feb 27 10:31:44 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | include/makeinclude/platform_linux_icc.GNU | 24 |
2 files changed, 22 insertions, 3 deletions
@@ -1667,6 +1667,7 @@ Otis Nyandoro <o.nyandoro@ee.wits.ac.za> Dmitri Belogaj <belogaj@nentec.de> Will Christof <Will.Christof@krones.de> Ferran Boladeres Salvadó <bds@iis.fhg.de> +Lubomir Bulej <lubomir.bulej@mff.cuni.cz> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/include/makeinclude/platform_linux_icc.GNU b/include/makeinclude/platform_linux_icc.GNU index 4a522c7da8c..de9ab871b1e 100644 --- a/include/makeinclude/platform_linux_icc.GNU +++ b/include/makeinclude/platform_linux_icc.GNU @@ -54,12 +54,26 @@ PLATFORM_WX_LDFLAGS = PLATFORM_AIO_SUPPORT := \ $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS) +# +# Intel compiler comes in two flavors with different binaries. The first, +# icc, is for IA32 platforms and the second, ecc, is for IA64 platforms. +# They share most options except those influencing target machine code +# generation, therefore we should pick sensible defaults for both +# depending on system architecture. +# +SYSARCH := $(shell uname -m) + ifeq ($(insure),1) CC = insure CXX = insure else -CC = icc -CXX = icc + ifeq ($(SYSARCH),ia64) + CC = ecc + CXX = ecc + else + CC = icc + CXX = icc + endif endif CFLAGS += -w1 @@ -85,7 +99,11 @@ PLATFORM_QT_CPPFLAGS=-I$(QTDIR)/include PLATFORM_QT_LIBS=-lqt PLATFORM_QT_LDFLAGS=-L$(QTDIR)/lib -OCFLAGS += -O3 -axK +OCFLAGS += -O3 +ifneq ($(SYSARCH),ia64) + OCFLAGS += -axK +endif + PIC = -KPIC AR = ar ARFLAGS = rsuv |