summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2008-06-18 10:44:03 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2008-06-18 10:44:03 +0000
commitc8f7ddca7f24b37ba667ec39e50bd4020935e57f (patch)
tree90ded039d6bf361fa3e4a3ebedc7bdbe3b0dbfcb
parent1e1b1969a200f4741d35400f7b523e644497da22 (diff)
downloadATCD-c8f7ddca7f24b37ba667ec39e50bd4020935e57f.tar.gz
Wed Jun 18 10:43:20 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/include/makeinclude/platform_linux_icc.GNU6
2 files changed, 6 insertions, 5 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 52423cbd118..62681df0d2b 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 18 10:43:20 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * include/makeinclude/platform_linux_icc.GNU:
+ Don't use deprecated options
+
Wed Jun 18 09:50:20 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
* README:
diff --git a/ACE/include/makeinclude/platform_linux_icc.GNU b/ACE/include/makeinclude/platform_linux_icc.GNU
index 14627ffa2ae..66d756c755e 100644
--- a/ACE/include/makeinclude/platform_linux_icc.GNU
+++ b/ACE/include/makeinclude/platform_linux_icc.GNU
@@ -78,11 +78,7 @@ OCFLAGS += -O3
# min/max float values in the TAO_IDL compiler tests
# If these options are not passed we can get overflows
# when testing min/max
-ifeq ($(SYSARCH),ia64)
- CPPFLAGS += -mp
-else
- CPPFLAGS += -fp-model double
-endif
+CPPFLAGS += -fp-model double
ifeq ($(optimize),0)
# Disable all optimizing in code