5b75a54ddf
As Intel uses it's own directory for ifc and icc, we don't conflict with ifc anymore. Because of ABI changes, you have to recompile C++ programs (don't forget stlport-icc). Note that this port is a _work in progress_: - Icc allows to use an already installed libstdc++ from gcc, this doesn't work yet on FreeBSD. Libstdc++ on 4.x is too old, so it's unlikely we can add support for it. The headers of libstdc++ shipping with FreeBSD 5.2-CURRENT use GCCisms not (yet) supported by icc, the hardcoded search path for them also doesn't fit for FreeBSD 5.2-CURRENT. - We've incorporated parts (cxa) of the FreeBSD >= 502101 libc on < 502101 systems. It's tested on 4.x, but not on FreeBSD < 502101. - Not all (new) options (including GCC compatibility) are thoroughly tested. When encountering problems please report to me first instead of directly contacting Intel. Ackknowledgements: - Bradley T Hughes <bhughes@trolltech.com> for PR 59552, it resulted in a modification of our libc (C++ DSO Object Destruction API) we incorporate in the port on < 502101 systems. - Marius Strobl <marius@alchemy.franken.de> for his help with the port (e.g. ld.c, cxa).
25 lines
868 B
C
25 lines
868 B
C
--- include/ivec.h.orig Tue Dec 9 20:16:16 2003
|
|
+++ include/ivec.h Tue Dec 9 20:36:38 2003
|
|
@@ -23,7 +23,7 @@
|
|
#include <assert.h>
|
|
|
|
/* If using MSVC5.0, explicit keyword should be used */
|
|
-#if (_MSC_VER >= 1100) || defined (__linux__)
|
|
+#if (_MSC_VER >= 1100) || defined (__linux__) || defined (__FreeBSD__)
|
|
#define EXPLICIT explicit
|
|
#else
|
|
#if (__INTEL_COMPILER)
|
|
@@ -35,10 +35,10 @@
|
|
#endif
|
|
|
|
/* Figure out whether and how to define the output operators */
|
|
-#if defined(_IOSTREAM_) || defined(_CPP_IOSTREAM)
|
|
+#if defined(_IOSTREAM_) || defined(_CPP_IOSTREAM) || defined(_STLP_IOSTREAM)
|
|
#define IVEC_DEFINE_OUTPUT_OPERATORS
|
|
#define IVEC_STD std::
|
|
-#elif defined(_INC_IOSTREAM) || defined(_IOSTREAM_H_)
|
|
+#elif defined(_INC_IOSTREAM) || defined(_IOSTREAM_H_) || defined(_STLP_IOSTREAM_H)
|
|
#define IVEC_DEFINE_OUTPUT_OPERATORS
|
|
#define IVEC_STD
|
|
#endif
|