diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-03-17 23:39:13 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-03-17 23:39:13 +0000 |
| commit | cf88092da3211e54ba8182be29c534ff6bd5982a (patch) | |
| tree | 4d899c96a617d410c30b2a08ae47613b0a3d08d1 | |
| parent | f65779d553feab5faa9df4154d04e9277353c756 (diff) | |
| download | ATCD-cf88092da3211e54ba8182be29c534ff6bd5982a.tar.gz | |
ChangeLogTag:Mon Mar 17 17:38:05 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | include/makeinclude/platform_linux_icc.GNU | 24 |
2 files changed, 28 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 2d8c7c7c07c..babb12704a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Mar 17 17:38:05 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * include/makeinclude/platform_linux_icc.GNU: The GNU file can now + work with 64 bit intel compiler in Itanium. Thanks to Lubomir + Bulej <lubomir.bulej@mff.cuni.cz> and Petr Tuma + <petr.tuma@mff.cuni.cz> for providing the patches. + Mon Mar 17 19:20:54 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * include/makeinclude/platform_cygwin32.GNU: 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 |