mirror of
https://git.FreeBSD.org/ports.git
synced 2025-02-02 11:09:29 +00:00
Update to 8.0.058.p061.
This version fixes the stlport test cases (heap corruption due to inlining and exception handling).
This commit is contained in:
parent
0b126d4134
commit
9a2a31e863
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=104293
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= icc
|
||||
PORTVERSION= 8.0.058.p060
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 8.0.058.p061
|
||||
CATEGORIES= lang linux devel
|
||||
MASTER_SITES=
|
||||
DISTNAME= l_cc_pc_${PORTVERSION:C/\.p.+$//}
|
||||
|
@ -1,4 +1,4 @@
|
||||
MD5 (l_cc_pc_8.0.058.tar.gz) = 51375cce8ef8bd9ff41fed5395b1ee5b
|
||||
SIZE (l_cc_pc_8.0.058.tar.gz) = 67771485
|
||||
MD5 (l_cc_pc_8.0.058_pe060.tar.gz) = a332816aa55bdb64228eeb62dab3bf88
|
||||
SIZE (l_cc_pc_8.0.058_pe060.tar.gz) = 7372371
|
||||
MD5 (l_cc_pc_8.0.058_pe061.tar.gz) = 80f4e4c0b7ff3d0d775e4d213f81a1cd
|
||||
SIZE (l_cc_pc_8.0.058_pe061.tar.gz) = 8768379
|
||||
|
@ -1,6 +1,12 @@
|
||||
--- include/c++/cstdio.orig Sat Dec 13 19:27:02 2003
|
||||
+++ include/c++/cstdio Sat Dec 13 19:28:46 2003
|
||||
@@ -13,36 +13,6 @@
|
||||
--- 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 */
|
||||
|
||||
@ -31,19 +37,25 @@
|
||||
- #endif /* !defined(__GLIBC__) etc. */
|
||||
-
|
||||
- #ifndef _HAS_POINTER_CLIB
|
||||
- #define _HAS_CONVENTIONAL_CLIB 1
|
||||
-/*
|
||||
- I do not know, why this is defined here, but this breaks down library
|
||||
- compilation. Commented out as QNX does
|
||||
- */
|
||||
-// #define _HAS_CONVENTIONAL_CLIB 1
|
||||
- #endif /* _HAS_POINTER_CLIB */
|
||||
-
|
||||
#ifdef _GLOBAL_USING
|
||||
_STD_BEGIN
|
||||
using _CSTD size_t; using _CSTD fpos_t; using _CSTD FILE;
|
||||
@@ -70,21 +40,6 @@
|
||||
@@ -74,23 +40,6 @@
|
||||
_STD_END
|
||||
#endif /* _GLOBAL_USING */
|
||||
|
||||
-#ifndef __QNX__
|
||||
-#ifndef _Filet
|
||||
- #define _Filet FILE
|
||||
-#endif /* _Filet */
|
||||
-#endif /* __QNX__ */
|
||||
-
|
||||
-#ifndef _FPOSOFF
|
||||
-
|
||||
|
@ -1,10 +1,12 @@
|
||||
--- include/c++/cwchar.orig Sat Dec 13 19:41:14 2003
|
||||
+++ include/c++/cwchar Sat Dec 13 19:42:25 2003
|
||||
@@ -9,25 +9,12 @@
|
||||
--- include/c++/cwchar.orig Wed Mar 17 14:30:53 2004
|
||||
+++ include/c++/cwchar Wed Mar 17 14:33:12 2004
|
||||
@@ -9,27 +9,12 @@
|
||||
#include <wchar.h>
|
||||
#define _STD_USING
|
||||
|
||||
-#ifndef __QNX__
|
||||
-typedef mbstate_t _Mbstatet;
|
||||
-#endif /* __QNX__ */
|
||||
-
|
||||
#else /* _STD_USING */
|
||||
#include <wchar.h>
|
||||
@ -27,7 +29,7 @@
|
||||
|
||||
#if __GLIBC__ > 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ >= 2
|
||||
using _CSTD fgetwc; using _CSTD fgetws; using _CSTD fputwc;
|
||||
@@ -35,20 +22,20 @@
|
||||
@@ -37,20 +22,20 @@
|
||||
using _CSTD putwc; using _CSTD putwchar; using _CSTD ungetwc;
|
||||
#endif
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- include/c++/yvals.h.orig Wed Dec 10 23:36:19 2003
|
||||
+++ include/c++/yvals.h Sun Dec 14 01:05:39 2003
|
||||
--- include/c++/yvals.h.orig Wed Mar 17 14:35:06 2004
|
||||
+++ include/c++/yvals.h Wed Mar 17 14:40:46 2004
|
||||
@@ -7,24 +7,10 @@
|
||||
|
||||
_ABRCPP -- to turn ON Abridged C++ dialect (implies _ECPP)
|
||||
@ -25,16 +25,18 @@
|
||||
|
||||
Include directories needed to compile with Dinkum C:
|
||||
|
||||
@@ -47,78 +33,10 @@
|
||||
@@ -47,85 +33,10 @@
|
||||
(--export --template_dir=lib/export)
|
||||
*/
|
||||
|
||||
-#define __need___va_list
|
||||
-#include <stdarg.h>
|
||||
-
|
||||
-#if !(defined __QNX__)
|
||||
-#include <features.h> /* Get glibc version __GLIBC__ and __GLIBC_MINOR__*/
|
||||
-#define __GLIBC_2_2 ((__GLIBC__ > 2) || ((__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 2)))
|
||||
- /* true if glibc-2.2 and older is used */
|
||||
-#endif /* __QNX__ */
|
||||
-
|
||||
-#define _CPPLIB_VER 402
|
||||
-
|
||||
@ -70,8 +72,13 @@
|
||||
-typedef unsigned _MACH_I32 _Uint32t;
|
||||
-
|
||||
- #else /* defined(_MACH_I32) */
|
||||
- #if defined __QNX__
|
||||
-typedef unsigned _Uint32t __attribute__((__aligned__(4)));
|
||||
-typedef int _Int32t __attribute__((__aligned__(4)));
|
||||
- #else /* __QNX__ */
|
||||
-typedef long _Int32t;
|
||||
-typedef unsigned long _Uint32t;
|
||||
- #endif /* __QNX__ */
|
||||
- #endif /* defined(_MACH_I32) */
|
||||
-
|
||||
- #if defined(_MACH_PDT)
|
||||
@ -104,7 +111,7 @@
|
||||
#if !defined(_ECPP) && defined(_ABRCPP)
|
||||
#define _ECPP
|
||||
#endif /* !defined(_ECPP) && defined(_ABRCPP) */
|
||||
@@ -139,56 +57,8 @@
|
||||
@@ -146,56 +57,8 @@
|
||||
#define _HAS_NAMESPACE 1 /* 1 for C++ names in std */
|
||||
#endif /* _HAS_NAMESPACE */
|
||||
|
||||
@ -159,9 +166,9 @@
|
||||
- #endif /* define _HAS_ITERATOR_DEBUGGING */
|
||||
-
|
||||
/* NAMESPACE CONTROL */
|
||||
|
||||
#if defined(__cplusplus)
|
||||
@@ -259,207 +129,14 @@
|
||||
#if defined(_ECPP) && defined(__cplusplus)
|
||||
#define _STD_USING 1 /* To be compatible with QNX, where _STD_USING defined for C++ only */
|
||||
@@ -283,217 +146,13 @@
|
||||
#define _END_EXTERN_C
|
||||
#endif /* __cplusplus */
|
||||
|
||||
@ -230,7 +237,14 @@
|
||||
- #ifdef __cplusplus
|
||||
- #define _WCHART
|
||||
-typedef wchar_t _Wchart;
|
||||
- #ifdef __QNX__
|
||||
-/* define _Wint and wint_t as QNX does */
|
||||
-typedef long _Wintt;
|
||||
-typedef _Wintt wint_t;
|
||||
- #else /* __QNX__ */
|
||||
-/* Original _Wint definition */
|
||||
-typedef wchar_t _Wintt;
|
||||
- #endif /* __QNX__ */
|
||||
- #endif /* __cplusplus */
|
||||
-
|
||||
- #if defined(_MSL_WCHAR_T_TYPE)
|
||||
@ -261,8 +275,10 @@
|
||||
- #define _WCMAX 0x7fffffff /* assume signed 32-bit wchar_t */
|
||||
-
|
||||
- #ifndef __cplusplus
|
||||
- #ifndef __QNX__ /* _Wchart declared in QNX system headers */
|
||||
-typedef __WCHAR_TYPE__ _Wchart;
|
||||
-typedef __WCHAR_TYPE__ _Wintt;
|
||||
- #endif /* __QNX__ */
|
||||
- #endif /* __cplusplus */
|
||||
-
|
||||
- #else /* default wchar_t/wint_t */
|
||||
@ -276,6 +292,9 @@
|
||||
-
|
||||
- #endif /* compiler/library type */
|
||||
-
|
||||
- /* POINTER PROPERTIES */
|
||||
-#define _NULL 0L /* 0L if pointer same as long */
|
||||
-
|
||||
- /* signal PROPERTIES */
|
||||
-
|
||||
-#define _SIGABRT 6
|
||||
@ -303,7 +322,7 @@
|
||||
-#define _EXFAIL 1 /* EXIT_FAILURE */
|
||||
-
|
||||
-_EXTERN_C
|
||||
-void _Atexit(void (*)(void));
|
||||
-void __Atexit(void (*)(void));
|
||||
-_END_EXTERN_C
|
||||
-
|
||||
- /* stdio PROPERTIES */
|
||||
@ -326,18 +345,16 @@
|
||||
-_C_STD_END
|
||||
-
|
||||
- /* MULTITHREAD PROPERTIES */
|
||||
-
|
||||
-_STD_BEGIN
|
||||
- #if _MULTI_THREAD
|
||||
-_EXTERN_C
|
||||
-void _Locksyslock(int);
|
||||
-void _Unlocksyslock(int);
|
||||
-_END_EXTERN_C
|
||||
-
|
||||
- #else /* _MULTI_THREAD */
|
||||
- #define _Locksyslock(x) (void)0
|
||||
- #define _Unlocksyslock(x) (void)0
|
||||
- #endif /* _MULTI_THREAD */
|
||||
-
|
||||
-_STD_END
|
||||
- /* LOCK MACROS */
|
||||
- #define _LOCK_LOCALE 0
|
||||
- #define _LOCK_MALLOC 1
|
||||
@ -353,7 +370,7 @@
|
||||
- if (_Locktype == _LOCK_MALLOC || _Locktype == _LOCK_DEBUG)
|
||||
- #endif /* _IOSTREAM_OP_LOCKS */
|
||||
-
|
||||
/* MISCELLANEOUS MACROS */
|
||||
- /* MISCELLANEOUS MACROS */
|
||||
-#define _ATEXIT_T void
|
||||
-
|
||||
-#define _MAX (max)
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- include/xmmintrin.h.orig Fri Jan 10 18:47:00 2003
|
||||
+++ include/xmmintrin.h Fri Jan 10 18:50:35 2003
|
||||
--- include/xmmintrin.h.orig Wed Mar 17 14:42:12 2004
|
||||
+++ include/xmmintrin.h Wed Mar 17 14:42:31 2004
|
||||
@@ -18,7 +18,7 @@
|
||||
#ifndef _INCLUDED_MM2
|
||||
#define _INCLUDED_MM2
|
||||
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
-#if defined(__linux__) || defined(__QNX__)
|
||||
+#if defined(__linux__) || defined(__QNX__) || defined(__FreeBSD__)
|
||||
#define __cdecl
|
||||
#endif
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user