diff options
Diffstat (limited to 'lang/icc/files')
| -rw-r--r-- | lang/icc/files/exclude | 1 | ||||
| -rw-r--r-- | lang/icc/files/exclude_noportdocs | 4 | ||||
| -rw-r--r-- | lang/icc/files/ld.c | 18 | ||||
| -rw-r--r-- | lang/icc/files/patch-bin::icc | 13 | ||||
| -rw-r--r-- | lang/icc/files/patch-bin::icpc | 13 | ||||
| -rw-r--r-- | lang/icc/files/patch-include::c++::cstdio | 6 | ||||
| -rw-r--r-- | lang/icc/files/patch-include::c++::yvals.h | 36 | ||||
| -rw-r--r-- | lang/icc/files/patch-include::xmmintrin.h | 4 |
8 files changed, 46 insertions, 49 deletions
diff --git a/lang/icc/files/exclude b/lang/icc/files/exclude index ad2f1d7a556b..c304cf11c1be 100644 --- a/lang/icc/files/exclude +++ b/lang/icc/files/exclude @@ -73,6 +73,7 @@ lib/libguide_stats.a lib/libguide_stats.so lib/libimf.so lib/libompstub.a +lib/libsvml.so lib/libunwind.so lib/libunwind.so.5 man/man1/icpc.1 diff --git a/lang/icc/files/exclude_noportdocs b/lang/icc/files/exclude_noportdocs index a5798667357d..f66878f3a50a 100644 --- a/lang/icc/files/exclude_noportdocs +++ b/lang/icc/files/exclude_noportdocs @@ -1,11 +1,7 @@ doc/C++ReleaseNotes.htm -doc/asm_lan.pdf -doc/asm_ug -doc/asm_ug.pdf doc/c_ug doc/c_ug_lnx.pdf doc/ccompindex.htm doc/flex_ug.pdf doc/icpi.htm -doc/ref doc/training diff --git a/lang/icc/files/ld.c b/lang/icc/files/ld.c index 2f135697e1d5..9df01de0660f 100644 --- a/lang/icc/files/ld.c +++ b/lang/icc/files/ld.c @@ -154,8 +154,14 @@ main(int argc, char *argv[], char *envp[]) */ #if __FreeBSD_version >= 500016 if ((libthr = getenv("PTHREAD_LIBS")) == NULL) -#endif +#if __FreeBSD_version >= 502102 + libthr = "-lpthread"; +#else libthr = "-lc_r"; +#endif +#else + libthr = "-lc_r"; +#endif /* * Use the appropriate libs for libc and libthr when linking static * and "-KPIC" or "-pg" where given. @@ -264,13 +270,14 @@ main(int argc, char *argv[], char *envp[]) } /* - * Force libcxa, libcxaguard and libunwind to static linkage, - * since the dynamic versions have glibc dependencies. + * Force libcxa, libcxaguard, libsvml and libunwind to static + * linkage, since the dynamic versions have glibc dependencies. * Don't add superfluous -Bdynamic. */ if (ARGCMP(i, "-Bdynamic") && i < argc - 1) { if (ARGCMP(i + 1, "-lcxa") || ARGCMP(i + 1, "-lcxaguard") || + ARGCMP(i + 1, "-lsvml") || ARGCMP(i + 1, "-lunwind")) { addarg(&al, "-Bstatic"); continue; @@ -284,7 +291,7 @@ main(int argc, char *argv[], char *envp[]) /* Don't add superfluous -Bstatic. */ if (ARGCMP(i, "-Bstatic") && i < argc - 1 && (ARGCMP(i + 1, "-lcprts") || ARGCMP(i + 1, "-lgcc_s") || - ARGCMP(i + 1, "-lunwind"))) + ARGCMP(i + 1, "-lsvml") || ARGCMP(i + 1, "-lunwind"))) continue; /* @@ -295,7 +302,8 @@ main(int argc, char *argv[], char *envp[]) strncmp(al.argv[al.argc - 1], "-B", 2)) { if (ARGCMP(i, "-lcxa") || ARGCMP(i, "-lcxaguard") || ARGCMP(i, "-limf") || ARGCMP(i, "-lirc") || - ARGCMP(i, "-lircmt") || ARGCMP(i, "-lunwind")) + ARGCMP(i, "-lirc_s") || ARGCMP(i, "-lsvml") || + ARGCMP(i, "-lunwind")) addarg(&al, "-Bstatic"); else addarg(&al, diff --git a/lang/icc/files/patch-bin::icc b/lang/icc/files/patch-bin::icc index 7988120de0c9..3e8be91a7406 100644 --- a/lang/icc/files/patch-bin::icc +++ b/lang/icc/files/patch-bin::icc @@ -1,17 +1,20 @@ --- bin/icc.orig Tue Dec 9 19:55:19 2003 +++ bin/icc Tue Dec 9 20:03:34 2003 -@@ -1,6 +1,9 @@ +@@ -1,6 +1,12 @@ #!/bin/sh -if [ -z INTEL_LICENSE_FILE ] +ICC_LOCALBASE=%%ICC_LOCALBASE%% -+export ICC_LOCALBASE; ++export ICC_LOCALBASE ++ ++GXX_ROOT=<INSTALLDIR>/lib ++export GXX_ROOT + +if [ -z "$INTEL_LICENSE_FILE" ] then INTEL_LICENSE_FILE=<INSTALLDIR>/licenses; else -@@ -8,7 +11,7 @@ +@@ -8,7 +14,7 @@ fi export INTEL_LICENSE_FILE; @@ -20,7 +23,7 @@ then LD_LIBRARY_PATH=<INSTALLDIR>/lib; else -@@ -16,7 +19,7 @@ +@@ -16,7 +22,7 @@ fi export LD_LIBRARY_PATH; @@ -29,7 +32,7 @@ then PATH=<INSTALLDIR>/bin; else -@@ -24,11 +27,46 @@ +@@ -24,11 +30,46 @@ fi export PATH; diff --git a/lang/icc/files/patch-bin::icpc b/lang/icc/files/patch-bin::icpc index fa1c7824506d..2c1f4483b729 100644 --- a/lang/icc/files/patch-bin::icpc +++ b/lang/icc/files/patch-bin::icpc @@ -1,17 +1,20 @@ --- bin/icpc.orig Tue Dec 9 19:55:12 2003 +++ bin/icpc Tue Dec 9 20:12:01 2003 -@@ -1,6 +1,9 @@ +@@ -1,6 +1,12 @@ #!/bin/sh -if [ -z INTEL_LICENSE_FILE ] +ICC_LOCALBASE=%%ICC_LOCALBASE%% -+export ICC_LOCALBASE; ++export ICC_LOCALBASE ++ ++GXX_ROOT=<INSTALLDIR>/lib ++export GXX_ROOT + +if [ -z "$INTEL_LICENSE_FILE" ] then INTEL_LICENSE_FILE=<INSTALLDIR>/licenses; else -@@ -8,7 +11,7 @@ +@@ -8,7 +14,7 @@ fi export INTEL_LICENSE_FILE; @@ -20,7 +23,7 @@ then LD_LIBRARY_PATH=<INSTALLDIR>/lib; else -@@ -16,7 +19,7 @@ +@@ -16,7 +22,7 @@ fi export LD_LIBRARY_PATH; @@ -29,7 +32,7 @@ then PATH=<INSTALLDIR>/bin; else -@@ -24,11 +27,39 @@ +@@ -24,11 +30,39 @@ fi export PATH; diff --git a/lang/icc/files/patch-include::c++::cstdio b/lang/icc/files/patch-include::c++::cstdio index 78a06f0c55b5..64a832a67796 100644 --- a/lang/icc/files/patch-include::c++::cstdio +++ b/lang/icc/files/patch-include::c++::cstdio @@ -1,11 +1,5 @@ --- include/c++/cstdio.orig Wed Mar 17 14:14:58 2004 +++ include/c++/cstdio Wed Mar 17 14:17:22 2004 -@@ -1,4 +1,4 @@ --/* static char cvs_id[] = "$Id: cstdio,v 1.11.2.1 2004/02/16 15:14:10 dens Exp $"; */ -+/* static char cvs_id[] = "$Id: cstdio,v 1.1 2004/03/17 13:15:04 netchild Exp $"; */ - // cstdio standard header - #ifndef _CSTDIO_ - #define _CSTDIO_ @@ -13,40 +13,6 @@ #include <stdio.h> #endif /* _STD_USING */ diff --git a/lang/icc/files/patch-include::c++::yvals.h b/lang/icc/files/patch-include::c++::yvals.h index d92b338a75a3..a44516b948f9 100644 --- a/lang/icc/files/patch-include::c++::yvals.h +++ b/lang/icc/files/patch-include::c++::yvals.h @@ -1,14 +1,14 @@ --- include/c++/yvals.h.orig Thu Mar 18 20:22:51 2004 +++ include/c++/yvals.h Sat Mar 27 13:32:51 2004 -@@ -7,24 +7,10 @@ +@@ -7,24 +7,6 @@ _ABRCPP -- to turn ON Abridged C++ dialect (implies _ECPP) _ECPP -- to turn ON Embedded C++ dialect -_NO_MT -- to turn OFF thread synchronization -_STL_DB (or _STLP_DEBUG) -- to turn ON iterator/range debugging - - You can change (in this header): - +- +-You can change (in this header): +- -_COMPILER_TLS -- from 0 to 1 if _TLS_QUAL is not nil -_EXFAIL -- from 1 to any nonzero value for EXIT_FAILURE -_FILE_OP_LOCKS -- from 0 to 1 for file atomic locks @@ -19,13 +19,13 @@ -_HAS_TRADITIONAL_ITERATORS -- from 1 to 0 to change vector/string iterators from - just pointers to something more complicated -_HAS_TRADITIONAL_POS_TYPE -- from 0 to 1 for streampos same as streamoff - _HAS_TRADITIONAL_STL -- from 1 to 0 to omit old STL functions +-_HAS_TRADITIONAL_STL -- from 1 to 0 to omit old STL functions -_IOSTREAM_OP_LOCKS -- from 0 to 1 for iostream atomic locks -_TLS_QUAL -- from nil to compiler TLS qualifier, such as __declspec(thread) Include directories needed to compile with Dinkum C: -@@ -47,85 +33,10 @@ +@@ -47,85 +29,10 @@ (--export --template_dir=lib/export) */ @@ -111,7 +111,7 @@ #if !defined(_ECPP) && defined(_ABRCPP) #define _ECPP #endif /* !defined(_ECPP) && defined(_ABRCPP) */ -@@ -146,56 +57,8 @@ +@@ -146,56 +53,8 @@ #define _HAS_NAMESPACE 1 /* 1 for C++ names in std */ #endif /* _HAS_NAMESPACE */ @@ -166,9 +166,9 @@ - #endif /* define _HAS_ITERATOR_DEBUGGING */ - /* NAMESPACE CONTROL */ - #if defined(_ECPP) && defined(__cplusplus) + #if defined(__QNX__) && defined(__cplusplus) #define _STD_USING 1 /* To be compatible with QNX, where _STD_USING defined for C++ only */ -@@ -283,229 +146,13 @@ +@@ -283,221 +142,13 @@ #define _END_EXTERN_C #endif /* __cplusplus */ @@ -301,7 +301,11 @@ -#define _SIGMAX 44 - - /* stdarg PROPERTIES */ +-#ifdef __x86_64__ +-typedef __gnuc_va_list _Va_list; +-#else -typedef va_list _Va_list; +-#endif - - #if _HAS_C9X - @@ -311,7 +315,7 @@ - - #ifndef va_copy -_EXTERN_C --void _Vacopy(va_list *, va_list); +-void _Vacopy(_Va_list *, _Va_list); -_END_EXTERN_C - #define va_copy(apd, aps) _Vacopy(&(apd), aps) - #endif /* va_copy */ @@ -322,11 +326,7 @@ -#define _EXFAIL 1 /* EXIT_FAILURE */ - -_EXTERN_C --#ifdef __QNX__ -void __Atexit(void (*)(void)); --#else --void _Atexit(void (*)(void)); --#endif -_END_EXTERN_C - - /* stdio PROPERTIES */ @@ -349,11 +349,7 @@ -_C_STD_END - - /* MULTITHREAD PROPERTIES */ --#ifdef __QNX__ -_STD_BEGIN --#else --_EXTERN_C --#endif - #if _MULTI_THREAD -void _Locksyslock(int); -void _Unlocksyslock(int); @@ -362,11 +358,7 @@ - #define _Locksyslock(x) (void)0 - #define _Unlocksyslock(x) (void)0 - #endif /* _MULTI_THREAD */ --#ifdef __QNX__ -_STD_END --#else --_END_EXTERN_C --#endif - /* LOCK MACROS */ - #define _LOCK_LOCALE 0 - #define _LOCK_MALLOC 1 diff --git a/lang/icc/files/patch-include::xmmintrin.h b/lang/icc/files/patch-include::xmmintrin.h index 02f5a4324d6a..7169899b6abf 100644 --- a/lang/icc/files/patch-include::xmmintrin.h +++ b/lang/icc/files/patch-include::xmmintrin.h @@ -4,8 +4,8 @@ #ifndef _INCLUDED_MM2 #define _INCLUDED_MM2 --#if defined(__linux__) || defined(__QNX__) -+#if defined(__linux__) || defined(__QNX__) || defined(__FreeBSD__) +-#if defined (__linux__) || defined (__QNX__) /* EIA Compiler does not compile either */ ++#if defined (__linux__) || defined (__FreeBSD__) || defined(__QNX__) /* EIA Compiler does not compile either */ #define __cdecl #endif |