5 files changed, 96 insertions, 311 deletions

diff --git a/lang/icc/files/cpio-exclude b/lang/icc/files/cpio-exclude
index 3ff7d00ae33f..be25b951fc6a 100644
--- a/lang/icc/files/cpio-exclude
+++ b/lang/icc/files/cpio-exclude
@@ -1,64 +1,87 @@
-*/opt/intel/compiler60/ia32/bin/uninstall
-*/opt/intel/compiler60/ia32/include/algorithm
-*/opt/intel/compiler60/ia32/include/bitset
-*/opt/intel/compiler60/ia32/include/complex
-*/opt/intel/compiler60/ia32/include/deque
-*/opt/intel/compiler60/ia32/include/fstream
-*/opt/intel/compiler60/ia32/include/fstream.h
-*/opt/intel/compiler60/ia32/include/functional
-*/opt/intel/compiler60/ia32/include/hash_map
-*/opt/intel/compiler60/ia32/include/hash_set
-*/opt/intel/compiler60/ia32/include/iomanip
-*/opt/intel/compiler60/ia32/include/iomanip.h
-*/opt/intel/compiler60/ia32/include/ios
-*/opt/intel/compiler60/ia32/include/iosfwd
-*/opt/intel/compiler60/ia32/include/iostream
-*/opt/intel/compiler60/ia32/include/iostream.h
-*/opt/intel/compiler60/ia32/include/istream
-*/opt/intel/compiler60/ia32/include/iterator
-*/opt/intel/compiler60/ia32/include/limits
-*/opt/intel/compiler60/ia32/include/list
-*/opt/intel/compiler60/ia32/include/locale
-*/opt/intel/compiler60/ia32/include/map
-*/opt/intel/compiler60/ia32/include/memory
-*/opt/intel/compiler60/ia32/include/numeric
-*/opt/intel/compiler60/ia32/include/ostream
-*/opt/intel/compiler60/ia32/include/queue
-*/opt/intel/compiler60/ia32/include/set
-*/opt/intel/compiler60/ia32/include/slist
-*/opt/intel/compiler60/ia32/include/sstream
-*/opt/intel/compiler60/ia32/include/stack
-*/opt/intel/compiler60/ia32/include/stdexcept
-*/opt/intel/compiler60/ia32/include/stdiostream.h
-*/opt/intel/compiler60/ia32/include/stl.h
-*/opt/intel/compiler60/ia32/include/stream.h
-*/opt/intel/compiler60/ia32/include/streambuf
-*/opt/intel/compiler60/ia32/include/string
-*/opt/intel/compiler60/ia32/include/strstream
-*/opt/intel/compiler60/ia32/include/strstream.h
-*/opt/intel/compiler60/ia32/include/utility
-*/opt/intel/compiler60/ia32/include/valarray
-*/opt/intel/compiler60/ia32/include/vector
-*/opt/intel/compiler60/ia32/include/xcomplex
-*/opt/intel/compiler60/ia32/include/xdebug
-*/opt/intel/compiler60/ia32/include/xhash
-*/opt/intel/compiler60/ia32/include/xiosbase
-*/opt/intel/compiler60/ia32/include/xlocale
-*/opt/intel/compiler60/ia32/include/xlocinfo
-*/opt/intel/compiler60/ia32/include/xlocinfo.h
-*/opt/intel/compiler60/ia32/include/xlocmes
-*/opt/intel/compiler60/ia32/include/xlocmon
-*/opt/intel/compiler60/ia32/include/xlocnum
-*/opt/intel/compiler60/ia32/include/xloctime
-*/opt/intel/compiler60/ia32/include/xmemory
-*/opt/intel/compiler60/ia32/include/xstring
-*/opt/intel/compiler60/ia32/include/xtree
-*/opt/intel/compiler60/ia32/include/xutility
-*/opt/intel/compiler60/ia32/include/ymath.h
-*/opt/intel/compiler60/ia32/lib/libcprts.a
-*/opt/intel/compiler60/ia32/lib/libcprts.so
-*/opt/intel/compiler60/ia32/lib/libcprts.so.1
-*/opt/intel/compiler60/ia32/lib/libguide.a
-*/opt/intel/compiler60/ia32/lib/libguide.so
-*/opt/intel/compiler60/ia32/lib/libunwind.so
-*/opt/intel/compiler60/ia32/lib/libunwind.so.1
+*/opt/intel/%%COMPILERDIR%%/ia32/bin/uninstall
+*/opt/intel/%%COMPILERDIR%%/ia32/include/algo.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/algorithm
+*/opt/intel/%%COMPILERDIR%%/ia32/include/alloca.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/bitset
+*/opt/intel/%%COMPILERDIR%%/ia32/include/stdbool.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/complex
+*/opt/intel/%%COMPILERDIR%%/ia32/include/deque
+*/opt/intel/%%COMPILERDIR%%/ia32/include/deque.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/float.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/fstream
+*/opt/intel/%%COMPILERDIR%%/ia32/include/fstream.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/functional
+*/opt/intel/%%COMPILERDIR%%/ia32/include/glob.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/hash_map
+*/opt/intel/%%COMPILERDIR%%/ia32/include/hash_set
+*/opt/intel/%%COMPILERDIR%%/ia32/include/iomanip
+*/opt/intel/%%COMPILERDIR%%/ia32/include/iomanip.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/ios
+*/opt/intel/%%COMPILERDIR%%/ia32/include/iosfwd
+*/opt/intel/%%COMPILERDIR%%/ia32/include/iostream
+*/opt/intel/%%COMPILERDIR%%/ia32/include/iostream.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/iso646.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/istream
+*/opt/intel/%%COMPILERDIR%%/ia32/include/iterator
+*/opt/intel/%%COMPILERDIR%%/ia32/include/limits
+*/opt/intel/%%COMPILERDIR%%/ia32/include/limits.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/list
+*/opt/intel/%%COMPILERDIR%%/ia32/include/list.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/locale
+*/opt/intel/%%COMPILERDIR%%/ia32/include/map
+*/opt/intel/%%COMPILERDIR%%/ia32/include/memory
+*/opt/intel/%%COMPILERDIR%%/ia32/include/numeric
+*/opt/intel/%%COMPILERDIR%%/ia32/include/omp.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/omp_lib.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/ostream
+*/opt/intel/%%COMPILERDIR%%/ia32/include/queue
+*/opt/intel/%%COMPILERDIR%%/ia32/include/set
+*/opt/intel/%%COMPILERDIR%%/ia32/include/slist
+*/opt/intel/%%COMPILERDIR%%/ia32/include/sstream
+*/opt/intel/%%COMPILERDIR%%/ia32/include/stack
+*/opt/intel/%%COMPILERDIR%%/ia32/include/stdarg.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/stddef.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/stdexcept
+*/opt/intel/%%COMPILERDIR%%/ia32/include/stdiostream.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/stl.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/stream.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/streambuf
+*/opt/intel/%%COMPILERDIR%%/ia32/include/streambuf.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/string
+*/opt/intel/%%COMPILERDIR%%/ia32/include/strstream
+*/opt/intel/%%COMPILERDIR%%/ia32/include/strstream.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/sys/sysmacros.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/syslimits.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/utility
+*/opt/intel/%%COMPILERDIR%%/ia32/include/valarray
+*/opt/intel/%%COMPILERDIR%%/ia32/include/varargs.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/vector
+*/opt/intel/%%COMPILERDIR%%/ia32/include/vector.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/xarg.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/xcomplex
+*/opt/intel/%%COMPILERDIR%%/ia32/include/xdebug
+*/opt/intel/%%COMPILERDIR%%/ia32/include/xhash
+*/opt/intel/%%COMPILERDIR%%/ia32/include/xiosbase
+*/opt/intel/%%COMPILERDIR%%/ia32/include/xlocale
+*/opt/intel/%%COMPILERDIR%%/ia32/include/xlocinfo
+*/opt/intel/%%COMPILERDIR%%/ia32/include/xlocinfo.h
+*/opt/intel/%%COMPILERDIR%%/ia32/include/xlocmes
+*/opt/intel/%%COMPILERDIR%%/ia32/include/xlocmon
+*/opt/intel/%%COMPILERDIR%%/ia32/include/xlocnum
+*/opt/intel/%%COMPILERDIR%%/ia32/include/xloctime
+*/opt/intel/%%COMPILERDIR%%/ia32/include/xmemory
+*/opt/intel/%%COMPILERDIR%%/ia32/include/xstring
+*/opt/intel/%%COMPILERDIR%%/ia32/include/xthreads
+*/opt/intel/%%COMPILERDIR%%/ia32/include/xtree
+*/opt/intel/%%COMPILERDIR%%/ia32/include/xutility
+*/opt/intel/%%COMPILERDIR%%/ia32/include/ymath.h
+*/opt/intel/%%COMPILERDIR%%/ia32/lib/libcprts.a
+*/opt/intel/%%COMPILERDIR%%/ia32/lib/libcprts.so
+*/opt/intel/%%COMPILERDIR%%/ia32/lib/libcprts.so.3
+*/opt/intel/%%COMPILERDIR%%/ia32/lib/libguide.a
+*/opt/intel/%%COMPILERDIR%%/ia32/lib/libguide.so
+*/opt/intel/%%COMPILERDIR%%/ia32/lib/libguide_stats.a
+*/opt/intel/%%COMPILERDIR%%/ia32/lib/libguide_stats.so
+*/opt/intel/%%COMPILERDIR%%/ia32/lib/libunwind.so
+*/opt/intel/%%COMPILERDIR%%/ia32/lib/libunwind.so.3
+*/opt/intel/%%COMPILERDIR%%/man/man1/ecc.1
diff --git a/lang/icc/files/ld.c b/lang/icc/files/ld.c
index c5d2f63858c9..d65b16dba244 100644
--- a/lang/icc/files/ld.c
+++ b/lang/icc/files/ld.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002 Marius Strobl
+ * Copyright (c) 2002-2003 Marius Strobl
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -185,6 +185,11 @@ main(int argc, char *argv[], char *envp[])
 			continue;
 		}
 
+	 	if (ARGCMP("-MT")) {
+			threaded++;
+			continue;
+	    	}
+
 	 	if (ARGCMP("-PIC")) {
 			pic++;
 			continue;
@@ -212,19 +217,8 @@ main(int argc, char *argv[], char *envp[])
 		}
 
 		/*
-		 * ICC links the thread safe libircmt instead of libirc when
-		 * told to generate threaded code by any of the compiler flags
-		 * "-mt", "-openmp" or "-parallel". We use this as an indicator
-		 * to link against libc_r.
-		 */
-		if (ARGCMP("-lircmt")) {
-			threaded++;
-			continue;
-		}
-
-		/*
-		 * Link against libc_p when "-pg" was given, "/usr/lib/gcrt1.o"
-		 * indicates this.
+		 * Link against libc_p when "-qp" or "-p" were given,
+		 * "/usr/lib/gcrt1.o" indicates this.
 		 */
 		if (ARGCMP("/usr/lib/gcrt1.o")) {
 			gprof++;
@@ -266,7 +260,7 @@ main(int argc, char *argv[], char *envp[])
 
 	for (i = 0; i < argc; i++) {
 	 	if (ARGCMP("-CPLUSPLUS") || ARGCMP("-BOOTSTRAPSTLPORT") ||
-		    ARGCMP("-PIC"))
+		    ARGCMP("-MT") || ARGCMP("-PIC"))
 			continue;
 
 		/* prepend "-melf_i386" to the commandline */
@@ -280,15 +274,6 @@ main(int argc, char *argv[], char *envp[])
 			continue;
 		}
 
-		/*
-		 * "-u ___pseudo_link" triggers linking of additional objects
-		 * from libcxa which seem to bloat the binaries, i.e. they
-		 * perfectly work without it. Intel Support promised to look
-		 * up what this servers for...
-		 */
-	 	if (ARGCMP("-u") || ARGCMP("___pseudo_link"))
-			continue;
-
 		/* Don't add obsolete flag "-Qy". */
 		if (ARGCMP("-Qy"))
 			continue;
@@ -360,16 +345,6 @@ main(int argc, char *argv[], char *envp[])
 		}
 
 		/*
-		 * Link and map files for C++ exception handling.
-		 */
-		if (!cpp &&
-		    (ARGCMP("--version-script") ||
-		    ARGCMPB(prefix, "/intel/compiler60/ia32/lib/icrt.link") ||
-		    ARGCMPB(prefix,
-			"/intel/compiler60/ia32/lib/icrt.internal.map")))
-			continue;
-
-		/*
 		 * Force libcxa and libunwind to static linkage, since the
 		 * dynamic versions have glibc dependencies.
 		 * Don't add superfluous -Bdynamic.
diff --git a/lang/icc/files/patch-icc b/lang/icc/files/patch-icc
deleted file mode 100644
index 66e2ee66830a..000000000000
--- a/lang/icc/files/patch-icc
+++ /dev/null
@@ -1,64 +0,0 @@
---- opt/intel/compiler60/ia32/bin/icc.orig	Tue Aug  6 04:34:18 2002
-+++ opt/intel/compiler60/ia32/bin/icc	Tue Aug  6 04:46:51 2002
-@@ -1,29 +1,52 @@
- #!/bin/sh
- 
--INTEL_LICENSE_FILE=<INSTALLDIR>/licenses;
-+PREFIX=@@PREFIX@@
-+export PREFIX;
-+INTEL_LICENSE_FILE=${PREFIX}/intel/licenses;
- export INTEL_LICENSE_FILE;
- 
- if [ -z LD_LIBRARY_PATH ]
- then 
-- LD_LIBRARY_PATH=<INSTALLDIR>/compiler60/ia32/lib;
-+ LD_LIBRARY_PATH=${PREFIX}/intel/compiler60/ia32/lib;
- else
-- LD_LIBRARY_PATH=<INSTALLDIR>/compiler60/ia32/lib:$LD_LIBRARY_PATH
-+ LD_LIBRARY_PATH=${PREFIX}/intel/compiler60/ia32/lib:$LD_LIBRARY_PATH
- fi
- export LD_LIBRARY_PATH;
- 
- if [ -z PATH ]
- then
-- PATH=<INSTALLDIR>/compiler60/ia32/bin;
-+ PATH=${PREFIX}/intel/compiler60/ia32/bin;
- else
-- PATH=<INSTALLDIR>/compiler60/ia32/bin:$PATH;
-+ PATH=${PREFIX}/intel/compiler60/ia32/bin:$PATH;
- fi
- export PATH;
- 
--export -n IA32ROOT; unset IA32ROOT;
--
- if [ $# != 0 ]
- then
-- exec -a "<INSTALLDIR>/compiler60/ia32/bin/icc" <INSTALLDIR>/compiler60/ia32/bin/iccbin "$@";
-+ i=0
-+ argc=$#
-+ while [ $i -lt $argc ] ; do
-+  val1=$1
-+  shift
-+  for s in .C .cc .cpp .cxx .c++; do
-+   val2=${val1%$s}
-+   if [ ${#val1} -gt ${#val2} ] ; then
-+    echo "Please use icpc to compile C++ source."
-+    exit 1
-+   fi
-+  done
-+  val2=${val1#"-openmp"}
-+  if [ ${#val1} -gt ${#val2} ] || [ ${val1} = "-parallel" ] ; then
-+   echo "Sorry, option '$val1' is not supported on FreeBSD."
-+   exit 1
-+  fi
-+  if [ ${val1} = "-Kpic" ] || [ ${val1} = "-KPIC" ] ; then
-+   set -- "$@" "-Qoption,ld,-PIC"
-+  fi
-+  set -- "$@" "$val1"
-+  i=$(($i+1))
-+ done
-+ exec ${PREFIX}/intel/compiler60/ia32/bin/iccbin "$@";
- else
-- exec -a "<INSTALLDIR>/compiler60/ia32/bin/icc" <INSTALLDIR>/compiler60/ia32/bin/iccbin;
-+ exec ${PREFIX}/intel/compiler60/ia32/bin/iccbin;
- fi
diff --git a/lang/icc/files/patch-icpc b/lang/icc/files/patch-icpc
deleted file mode 100644
index 0853a53798bd..000000000000
--- a/lang/icc/files/patch-icpc
+++ /dev/null
@@ -1,57 +0,0 @@
---- opt/intel/compiler60/ia32/bin/icpc.orig	Fri Sep  6 02:18:03 2002
-+++ opt/intel/compiler60/ia32/bin/icpc	Tue Sep 10 18:32:59 2002
-@@ -1,29 +1,45 @@
- #!/bin/sh
- 
--INTEL_LICENSE_FILE=<INSTALLDIR>/licenses;
-+PREFIX=@@PREFIX@@
-+export PREFIX;
-+INTEL_LICENSE_FILE=${PREFIX}/intel/licenses;
- export INTEL_LICENSE_FILE;
- 
- if [ -z LD_LIBRARY_PATH ]
- then 
-- LD_LIBRARY_PATH=<INSTALLDIR>/compiler60/ia32/lib;
-+ LD_LIBRARY_PATH=${PREFIX}/intel/compiler60/ia32/lib;
- else
-- LD_LIBRARY_PATH=<INSTALLDIR>/compiler60/ia32/lib:$LD_LIBRARY_PATH
-+ LD_LIBRARY_PATH=${PREFIX}/intel/compiler60/ia32/lib:$LD_LIBRARY_PATH
- fi
- export LD_LIBRARY_PATH;
- 
- if [ -z PATH ]
- then
-- PATH=<INSTALLDIR>/compiler60/ia32/bin;
-+ PATH=${PREFIX}/intel/compiler60/ia32/bin;
- else
-- PATH=<INSTALLDIR>/compiler60/ia32/bin:$PATH;
-+ PATH=${PREFIX}/intel/compiler60/ia32/bin:$PATH;
- fi
- export PATH;
- 
--export -n IA32ROOT; unset IA32ROOT;
--
- if [ $# != 0 ]
- then
-- exec -a "<INSTALLDIR>/compiler60/ia32/bin/icpc" <INSTALLDIR>/compiler60/ia32/bin/icpcbin "$@";
-+ i=0
-+ argc=$#
-+ while [ $i -lt $argc ] ; do
-+  val1=$1
-+  shift
-+  val2=${val1#"-openmp"}
-+  if [ ${#val1} -gt ${#val2} ] || [ ${val1} = "-parallel" ] ; then
-+   echo "Sorry, option '$val1' is not supported on FreeBSD."
-+   exit 1
-+  fi
-+  if [ ${val1} = "-Kpic" ] || [ ${val1} = "-KPIC" ] ; then
-+   set -- "$@" "-Qoption,ld,-PIC"
-+  fi
-+  set -- "$@" "$val1"
-+  i=$(($i+1))
-+ done
-+ exec ${PREFIX}/intel/compiler60/ia32/bin/icpcbin "$@";
- else
-- exec -a "<INSTALLDIR>/compiler60/ia32/bin/icpc" <INSTALLDIR>/compiler60/ia32/bin/icpcbin;
-+ exec ${PREFIX}/intel/compiler60/ia32/bin/icpcbin;
- fi
diff --git a/lang/icc/files/patch-include b/lang/icc/files/patch-include
deleted file mode 100644
index 35613dd41e4b..000000000000
--- a/lang/icc/files/patch-include
+++ /dev/null
@@ -1,92 +0,0 @@
---- opt/intel/compiler60/ia32/include/yvals.h.orig	Wed Apr 24 12:13:04 2002
-+++ opt/intel/compiler60/ia32/include/yvals.h	Wed Apr 24 12:13:26 2002
-@@ -4,10 +4,6 @@
- #define _YVALS
- #include <stdarg.h>
- 
--#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 */
--
- #define _CPPLIB_VER	310
- 
-  #if defined(ia64) || defined(__ia64) || defined(__ia64__)	/* assume Itanium */
---- opt/intel/compiler60/ia32/include/cwchar.orig	Tue Aug  6 04:32:48 2002
-+++ opt/intel/compiler60/ia32/include/cwchar	Tue Aug  6 05:04:09 2002
-@@ -13,25 +13,29 @@
- 
-  #ifdef _GLOBAL_USING
- _STD_BEGIN
--using ::mbstate_t; using ::size_t; using ::tm; using ::wint_t;
-+using ::mbstate_t; using ::size_t; using ::wint_t;
-+// using ::tm;
- 
- 
--using ::btowc;
-+// using ::btowc;
- // using ::fwide; using ::fwprintf;
- // using ::fwscanf;
--using ::mbrlen; using ::mbrtowc; using ::mbsrtowcs;
--using ::mbsinit;
-+// using ::mbrlen; using ::mbrtowc; using ::mbsrtowcs;
-+// using ::mbsinit;
- // using ::swprintf; using ::swscanf;
- // using ::vfwprintf; using ::vswprintf; using ::vwprintf;
--using ::wcrtomb;
-+// using ::wcrtomb;
- // using ::wprintf; using ::wscanf;
--using ::wcsrtombs; using ::wcstol; using ::wcscat;
--using ::wcschr; using ::wcscmp; using ::wcscoll;
-+// using ::wcsrtombs; using ::wcstol;
-+using ::wcscat;
-+using ::wcschr; using ::wcscmp;
-+// using ::wcscoll;
- using ::wcscpy; using ::wcscspn; using ::wcslen;
- using ::wcsncat; using ::wcsncmp; using ::wcsncpy;
- using ::wcspbrk; using ::wcsrchr; using ::wcsspn;
--using ::wcstod; using ::wcstoul; using ::wcsstr;
--using ::wcstok; using ::wcsxfrm; using ::wctob;
-+// using ::wcstod; using ::wcstoul;
-+using ::wcsstr;
-+// using ::wcstok; using ::wcsxfrm; using ::wctob;
- using ::wmemchr; using ::wmemcmp; using ::wmemcpy;
- using ::wmemmove; using ::wmemset;
- // using ::wcsftime;
---- opt/intel/compiler60/ia32/include/cfloat.orig	Thu Sep 12 07:08:29 2002
-+++ opt/intel/compiler60/ia32/include/cfloat	Thu Sep 12 08:01:57 2002
-@@ -6,35 +6,6 @@
- 
- #include <float.h>
- 
-- #if __EDG__
--_C_STD_BEGIN
--		/* TYPE DEFINITIONS */
--typedef struct
--	{	/* parameters for a floating-point type */
--	int _Ddig, _Dmdig, _Dmax10e, _Dmaxe, _Dmin10e, _Dmine;
--	union
--		{	/* union of short array and all floats */
--		unsigned short _Us[8];
--		float _Float;
--		double _Double;
--		long double _Long_double;
--		} _Deps, _Dmax, _Dmin;
--	} _Dvals;
--
--		/* DECLARATIONS */
--_C_LIB_DECL
--extern const _Dvals _Ldbl;
--_END_C_LIB_DECL
--_C_STD_END
--
--#undef LDBL_EPSILON	/* redefine macros that use gcc extension */
--#undef LDBL_MAX
--#undef LDBL_MIN
--
--#define LDBL_EPSILON	_CSTD _Ldbl._Deps._Long_double
--#define LDBL_MAX		_CSTD _Ldbl._Dmax._Long_double
--#define LDBL_MIN		_CSTD _Ldbl._Dmin._Long_double
-- #endif /* __EDG__ */
- #endif /* _CFLOAT_ */
- 
- /*