^vax^__vax__

28 files changed, 114 insertions, 114 deletions

diff --git a/lib/libm/noieee_src/mathimpl.h b/lib/libm/noieee_src/mathimpl.h
index 30e94f03b01..e4ed3fd91b2 100644
--- a/lib/libm/noieee_src/mathimpl.h
+++ b/lib/libm/noieee_src/mathimpl.h
@@ -37,7 +37,7 @@
 #include <sys/cdefs.h>
 #include <math.h>
 
-#if defined(vax)||defined(tahoe)
+#if defined(__vax__)||defined(tahoe)
 
 /* Deal with different ways to concatenate in cpp */
 #  ifdef __STDC__
@@ -47,7 +47,7 @@
 #  endif
 
 /* Deal with vax/tahoe byte order issues */
-#  ifdef vax
+#  ifdef __vax__
 #    define	cat3t(a,b,c) cat3(a,b,c)
 #  else
 #    define	cat3t(a,b,c) cat3(a,c,b)
@@ -85,7 +85,7 @@
 #  define ic(name, value, bexp, xval) \
 	const static double name = value;
 
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
 
 
 /*
diff --git a/lib/libm/noieee_src/n_acosh.c b/lib/libm/noieee_src/n_acosh.c
index ce909d16ea3..08485f2641f 100644
--- a/lib/libm/noieee_src/n_acosh.c
+++ b/lib/libm/noieee_src/n_acosh.c
@@ -92,9 +92,9 @@ acosh(x)
 {	
 	double t,big=1.E20; /* big+1==big */
 
-#if !defined(vax)&&!defined(tahoe)
+#if !defined(__vax__)&&!defined(tahoe)
 	if(x!=x) return(x);	/* x is NaN */
-#endif	/* !defined(vax)&&!defined(tahoe) */
+#endif	/* !defined(__vax__)&&!defined(tahoe) */
 
     /* return log1p(x) + log(2) if x is large */
 	if(x>big) {t=log1p(x)+ln2lo; return(t+ln2hi);} 
diff --git a/lib/libm/noieee_src/n_asincos.c b/lib/libm/noieee_src/n_asincos.c
index 581e978fe59..63425a07f26 100644
--- a/lib/libm/noieee_src/n_asincos.c
+++ b/lib/libm/noieee_src/n_asincos.c
@@ -95,9 +95,9 @@ asin(x)
 	double x;
 {
 	double s,t,copysign(),atan2(),sqrt(),one=1.0;
-#if !defined(vax)&&!defined(tahoe)
+#if !defined(__vax__)&&!defined(tahoe)
 	if(x!=x) return(x);	/* x is NaN */
-#endif	/* !defined(vax)&&!defined(tahoe) */
+#endif	/* !defined(__vax__)&&!defined(tahoe) */
 	s=copysign(x,one);
 	if(s <= 0.5)
 	    return(atan2(x,sqrt(one-x*x)));
@@ -163,9 +163,9 @@ acos(x)
 	double x;
 {
 	double t,copysign(),atan2(),sqrt(),one=1.0;
-#if !defined(vax)&&!defined(tahoe)
+#if !defined(__vax__)&&!defined(tahoe)
 	if(x!=x) return(x);
-#endif	/* !defined(vax)&&!defined(tahoe) */
+#endif	/* !defined(__vax__)&&!defined(tahoe) */
 	if( x != -1.0)
 	    t=atan2(sqrt((one-x)/(one+x)),one);
 	else
diff --git a/lib/libm/noieee_src/n_asinh.c b/lib/libm/noieee_src/n_asinh.c
index 05b325ed86a..750a1f3bf83 100644
--- a/lib/libm/noieee_src/n_asinh.c
+++ b/lib/libm/noieee_src/n_asinh.c
@@ -89,9 +89,9 @@ double x;
 				big  =1.0E20,	/* fl(1+big) == big */
 				one  =1.0   ;	
 
-#if !defined(vax)&&!defined(tahoe)
+#if !defined(__vax__)&&!defined(tahoe)
 	if(x!=x) return(x);	/* x is NaN */
-#endif	/* !defined(vax)&&!defined(tahoe) */
+#endif	/* !defined(__vax__)&&!defined(tahoe) */
 	if((t=copysign(x,one))>small) 
 	    if(t<big) {
 	     	s=one/t; return(copysign(log1p(t+t/(s+sqrt(one+s*s))),x)); }
diff --git a/lib/libm/noieee_src/n_atan2.c b/lib/libm/noieee_src/n_atan2.c
index 042f40d0863..8e675095f7e 100644
--- a/lib/libm/noieee_src/n_atan2.c
+++ b/lib/libm/noieee_src/n_atan2.c
@@ -180,10 +180,10 @@ double  y,x;
 	double t,z,signy,signx,hi,lo;
 	int k,m;
 
-#if !defined(vax)&&!defined(tahoe)
+#if !defined(__vax__)&&!defined(tahoe)
     /* if x or y is NAN */
 	if(x!=x) return(x); if(y!=y) return(y);
-#endif	/* !defined(vax)&&!defined(tahoe) */
+#endif	/* !defined(__vax__)&&!defined(tahoe) */
 
     /* copy down the sign of y and x */
 	signy = copysign(one,y) ;  
@@ -269,13 +269,13 @@ begin:
 
     /* compute atan(t) for t in [-.4375, .4375] */
 	z = t*t;
-#if defined(vax)||defined(tahoe)
+#if defined(__vax__)||defined(tahoe)
 	z = t*(z*(a1+z*(a2+z*(a3+z*(a4+z*(a5+z*(a6+z*(a7+z*(a8+
 			z*(a9+z*(a10+z*(a11+z*a12))))))))))));
-#else	/* defined(vax)||defined(tahoe) */
+#else	/* defined(__vax__)||defined(tahoe) */
 	z = t*(z*(a1+z*(a2+z*(a3+z*(a4+z*(a5+z*(a6+z*(a7+z*(a8+
 			z*(a9+z*(a10+z*a11)))))))))));
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
 	z = lo - z; z += t; z += hi;
 
 	return(copysign((signx>zero)?z:PI-z,signy));
diff --git a/lib/libm/noieee_src/n_atanh.c b/lib/libm/noieee_src/n_atanh.c
index 7fce056b3a1..fdfff56684e 100644
--- a/lib/libm/noieee_src/n_atanh.c
+++ b/lib/libm/noieee_src/n_atanh.c
@@ -64,9 +64,9 @@ static char sccsid[] = "@(#)atanh.c	8.1 (Berkeley) 6/4/93";
  */
 #include "mathimpl.h"
 
-#if defined(vax)||defined(tahoe)
+#if defined(__vax__)||defined(tahoe)
 #include <errno.h>
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
 
 double atanh(x)
 double x;
@@ -74,11 +74,11 @@ double x;
 	double z;
 	z = copysign(0.5,x);
 	x = copysign(x,1.0);
-#if defined(vax)||defined(tahoe)
+#if defined(__vax__)||defined(tahoe)
 	if (x == 1.0) {
 	    return(copysign(1.0,z)*infnan(ERANGE));	/* sign(x)*INF */
 	}
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
 	x = x/(1.0-x);
 	return( z*log1p(x+x) );
 }
diff --git a/lib/libm/noieee_src/n_cabs.c b/lib/libm/noieee_src/n_cabs.c
index 6a823572078..f7c153e473b 100644
--- a/lib/libm/noieee_src/n_cabs.c
+++ b/lib/libm/noieee_src/n_cabs.c
@@ -152,9 +152,9 @@ double x, y;
 	         return (copysign(x,one));
 	else if(finite(y))
 	         return(x);		   /* x is NaN, y is finite */
-#if !defined(vax)&&!defined(tahoe)
+#if !defined(__vax__)&&!defined(tahoe)
 	else if(y!=y) return(y);  /* x and y is NaN */
-#endif	/* !defined(vax)&&!defined(tahoe) */
+#endif	/* !defined(__vax__)&&!defined(tahoe) */
 	else return(copysign(y,one));   /* y is INF */
 }
 
diff --git a/lib/libm/noieee_src/n_cbrt.c b/lib/libm/noieee_src/n_cbrt.c
index 9be6c50dffa..218f27db135 100644
--- a/lib/libm/noieee_src/n_cbrt.c
+++ b/lib/libm/noieee_src/n_cbrt.c
@@ -54,7 +54,7 @@ static char sccsid[] = "@(#)cbrt.c	8.1 (Berkeley) 6/4/93";
  * On a National machine, it has different ordering; therefore, this code 
  * must be compiled with flag -DNATIONAL. 
  */
-#if !defined(vax)&&!defined(tahoe)
+#if !defined(__vax__)&&!defined(tahoe)
 
 static const unsigned long
 		     B1 = 715094163, /* B1 = (682-0.03306235651)*2**20 */
diff --git a/lib/libm/noieee_src/n_cosh.c b/lib/libm/noieee_src/n_cosh.c
index bba92d10897..37dceb41359 100644
--- a/lib/libm/noieee_src/n_cosh.c
+++ b/lib/libm/noieee_src/n_cosh.c
@@ -99,11 +99,11 @@ ic(lnovfl, 7.0978271289338397310E2,     9, 1.62E42FEFA39EF)
 #define   lnovfl    vccast(lnovfl)
 #endif
 
-#if defined(vax)||defined(tahoe)
+#if defined(__vax__)||defined(tahoe)
 static max = 126                      ;
-#else	/* defined(vax)||defined(tahoe) */
+#else	/* defined(__vax__)||defined(tahoe) */
 static max = 1023                     ;
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
 
 double cosh(x)
 double x;
@@ -112,9 +112,9 @@ double x;
 		one=1.0, small=1.0E-18; /* fl(1+small)==1 */
 	double t;
 
-#if !defined(vax)&&!defined(tahoe)
+#if !defined(__vax__)&&!defined(tahoe)
 	if(x!=x) return(x);	/* x is NaN */
-#endif	/* !defined(vax)&&!defined(tahoe) */
+#endif	/* !defined(__vax__)&&!defined(tahoe) */
 	if((x=copysign(x,one)) <= 22)
 	    if(x<0.3465) 
 		if(x<small) return(one+x);
diff --git a/lib/libm/noieee_src/n_erf.c b/lib/libm/noieee_src/n_erf.c
index c0bf8273bc6..01e03d14ccc 100644
--- a/lib/libm/noieee_src/n_erf.c
+++ b/lib/libm/noieee_src/n_erf.c
@@ -146,7 +146,7 @@ static char sccsid[] = "@(#)erf.c	8.1 (Berkeley) 6/4/93";
  *	   	erfc/erf(NaN) is NaN
  */
 
-#if defined(vax) || defined(tahoe)
+#if defined(__vax__) || defined(tahoe)
 #define _IEEE	0
 #define TRUNC(x) (double) (float) (x)
 #else
diff --git a/lib/libm/noieee_src/n_exp.c b/lib/libm/noieee_src/n_exp.c
index d242054a329..9077f7e1205 100644
--- a/lib/libm/noieee_src/n_exp.c
+++ b/lib/libm/noieee_src/n_exp.c
@@ -121,9 +121,9 @@ double x;
 	double  z,hi,lo,c;
 	int k;
 
-#if !defined(vax)&&!defined(tahoe)
+#if !defined(__vax__)&&!defined(tahoe)
 	if(x!=x) return(x);	/* x is NaN */
-#endif	/* !defined(vax)&&!defined(tahoe) */
+#endif	/* !defined(__vax__)&&!defined(tahoe) */
 	if( x <= lnhuge ) {
 		if( x >= lntiny ) {
 
@@ -166,9 +166,9 @@ double x, c;
 	double  z,hi,lo, t;
 	int k;
 
-#if !defined(vax)&&!defined(tahoe)
+#if !defined(__vax__)&&!defined(tahoe)
 	if (x!=x) return(x);	/* x is NaN */
-#endif	/* !defined(vax)&&!defined(tahoe) */
+#endif	/* !defined(__vax__)&&!defined(tahoe) */
 	if ( x <= lnhuge ) {
 		if ( x >= lntiny ) {
 
diff --git a/lib/libm/noieee_src/n_exp__E.c b/lib/libm/noieee_src/n_exp__E.c
index f03ed43ba33..5e3c198807d 100644
--- a/lib/libm/noieee_src/n_exp__E.c
+++ b/lib/libm/noieee_src/n_exp__E.c
@@ -116,11 +116,11 @@ double x,c;
 	if(copysign(x,one)>small) {
            z = x*x  ;
 	   p = z*( p1 +z* p2 );
-#if defined(vax)||defined(tahoe)
+#if defined(__vax__)||defined(tahoe)
            q = z*( q1 +z*( q2 +z* q3 ));
-#else	/* defined(vax)||defined(tahoe) */
+#else	/* defined(__vax__)||defined(tahoe) */
            q = z*( q1 +z*  q2 );
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
            xp= x*p     ; 
 	   xh= x*half  ;
            w = xh-(q-xp)  ;
diff --git a/lib/libm/noieee_src/n_expm1.c b/lib/libm/noieee_src/n_expm1.c
index 4c95d35e3cc..78fe224dfb8 100644
--- a/lib/libm/noieee_src/n_expm1.c
+++ b/lib/libm/noieee_src/n_expm1.c
@@ -112,15 +112,15 @@ double x;
 	const static double one=1.0, half=1.0/2.0; 
 	double  z,hi,lo,c;
 	int k;
-#if defined(vax)||defined(tahoe)
+#if defined(__vax__)||defined(tahoe)
 	static prec=56;
-#else	/* defined(vax)||defined(tahoe) */
+#else	/* defined(__vax__)||defined(tahoe) */
 	static prec=53;
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
 
-#if !defined(vax)&&!defined(tahoe)
+#if !defined(__vax__)&&!defined(tahoe)
 	if(x!=x) return(x);	/* x is NaN */
-#endif	/* !defined(vax)&&!defined(tahoe) */
+#endif	/* !defined(__vax__)&&!defined(tahoe) */
 
 	if( x <= lnhuge ) {
 		if( x >= -40.0 ) {
diff --git a/lib/libm/noieee_src/n_floor.c b/lib/libm/noieee_src/n_floor.c
index 48786df8527..d443046cac4 100644
--- a/lib/libm/noieee_src/n_floor.c
+++ b/lib/libm/noieee_src/n_floor.c
@@ -60,9 +60,9 @@ double x;
 	volatile double y;
 
 	if (
-#if !defined(vax)&&!defined(tahoe)
+#if !defined(__vax__)&&!defined(tahoe)
 		x != x ||	/* NaN */
-#endif	/* !defined(vax)&&!defined(tahoe) */
+#endif	/* !defined(__vax__)&&!defined(tahoe) */
 		x >= L)		/* already an even integer */
 		return x;
 	else if (x < (double)0)
@@ -81,9 +81,9 @@ double x;
 	volatile double y;
 
 	if (
-#if !defined(vax)&&!defined(tahoe)
+#if !defined(__vax__)&&!defined(tahoe)
 		x != x ||	/* NaN */
-#endif	/* !defined(vax)&&!defined(tahoe) */
+#endif	/* !defined(__vax__)&&!defined(tahoe) */
 		x >= L)		/* already an even integer */
 		return x;
 	else if (x < (double)0)
@@ -125,10 +125,10 @@ double x;
 	volatile double t;
 	const double one = 1.0;
 
-#if !defined(vax)&&!defined(tahoe)
+#if !defined(__vax__)&&!defined(tahoe)
 	if (x != x)				/* NaN */
 		return (x);
-#endif	/* !defined(vax)&&!defined(tahoe) */
+#endif	/* !defined(__vax__)&&!defined(tahoe) */
 	if (copysign(x,one) >= L)		/* already an integer */
 	    return (x);
 	s = copysign(L,x);
diff --git a/lib/libm/noieee_src/n_fmod.c b/lib/libm/noieee_src/n_fmod.c
index 99cdf9ca5cd..581382b2c7d 100644
--- a/lib/libm/noieee_src/n_fmod.c
+++ b/lib/libm/noieee_src/n_fmod.c
@@ -64,9 +64,9 @@ static char sccsid[] = "@(#)fmod.c	8.1 (Berkeley) 6/4/93";
  *    fmod(x,0), fmod(INF,y) are invalid operations and NaN is returned.
  *
  */
-#if !defined(vax) && !defined(tahoe)
+#if !defined(__vax__) && !defined(tahoe)
 extern int isnan(),finite();
-#endif	/* !defined(vax) && !defined(tahoe) */
+#endif	/* !defined(__vax__) && !defined(tahoe) */
 extern double frexp(),ldexp(),fabs();
 
 #ifdef TEST_FMOD
@@ -82,9 +82,9 @@ double x,y;
 	double r,w;
 
 	if (y == (double)0
-#if !defined(vax) && !defined(tahoe)	/* per "fmod" manual entry, SunOS 4.0 */
+#if !defined(__vax__) && !defined(tahoe)	/* per "fmod" manual entry, SunOS 4.0 */
 		|| isnan(y) || !finite(x)
-#endif	/* !defined(vax) && !defined(tahoe) */
+#endif	/* !defined(__vax__) && !defined(tahoe) */
 	    )
 	    return (x*y)/(x*y);
 
diff --git a/lib/libm/noieee_src/n_gamma.c b/lib/libm/noieee_src/n_gamma.c
index a5d5e949898..b719cdd978c 100644
--- a/lib/libm/noieee_src/n_gamma.c
+++ b/lib/libm/noieee_src/n_gamma.c
@@ -127,7 +127,7 @@ static int endian;
  * TRUNC sets trailing bits in a floating-point number to zero.
  * is a temporary variable.
  */
-#if defined(vax) || defined(tahoe)
+#if defined(__vax__) || defined(tahoe)
 #define _IEEE		0
 #define TRUNC(x)	x = (double) (float) (x)
 #else
diff --git a/lib/libm/noieee_src/n_j0.c b/lib/libm/noieee_src/n_j0.c
index 3148fb18e32..0654adb4cbd 100644
--- a/lib/libm/noieee_src/n_j0.c
+++ b/lib/libm/noieee_src/n_j0.c
@@ -115,7 +115,7 @@ static char sccsid[] = "@(#)j0.c	8.2 (Berkeley) 11/30/93";
 #include <float.h>
 #include <errno.h>
 
-#if defined(vax) || defined(tahoe)
+#if defined(__vax__) || defined(tahoe)
 #define _IEEE	0
 #else
 #define _IEEE	1
diff --git a/lib/libm/noieee_src/n_j1.c b/lib/libm/noieee_src/n_j1.c
index 2de8182fb6f..e71bd87a7e6 100644
--- a/lib/libm/noieee_src/n_j1.c
+++ b/lib/libm/noieee_src/n_j1.c
@@ -115,7 +115,7 @@ static char sccsid[] = "@(#)j1.c	8.2 (Berkeley) 11/30/93";
 #include <float.h>
 #include <errno.h>
 
-#if defined(vax) || defined(tahoe)
+#if defined(__vax__) || defined(tahoe)
 #define _IEEE	0
 #else
 #define _IEEE	1
@@ -170,11 +170,11 @@ double j1(x)
 	 * j1(x) = 1/sqrt(pi) * (P(1,x)*cc - Q(1,x)*ss) / sqrt(x)
 	 * y1(x) = 1/sqrt(pi) * (P(1,x)*ss + Q(1,x)*cc) / sqrt(x)
 	 */
-#if !defined(vax) && !defined(tahoe)
+#if !defined(__vax__) && !defined(tahoe)
 		if (y > two_129)	 /* x > 2^129 */
 			z = (invsqrtpi*cc)/sqrt(y);
 		else
-#endif /* defined(vax) || defined(tahoe) */
+#endif /* defined(__vax__) || defined(tahoe) */
 		{
 		    u = pone(y); v = qone(y);
 		    z = invsqrtpi*(u*cc-v*ss)/sqrt(y);
diff --git a/lib/libm/noieee_src/n_jn.c b/lib/libm/noieee_src/n_jn.c
index 31eef767a1b..5e210fce1c8 100644
--- a/lib/libm/noieee_src/n_jn.c
+++ b/lib/libm/noieee_src/n_jn.c
@@ -96,7 +96,7 @@ static char sccsid[] = "@(#)jn.c	8.2 (Berkeley) 11/30/93";
 #include <float.h>
 #include <errno.h>
 
-#if defined(vax) || defined(tahoe)
+#if defined(__vax__) || defined(tahoe)
 #define _IEEE	0
 #else
 #define _IEEE	1
@@ -239,11 +239,11 @@ double jn(n,x)
 		        b = ((i+i)/x)*b - a;
 		        a = temp;
 		    /* scale b to avoid spurious overflow */
-#			if defined(vax) || defined(tahoe)
+#			if defined(__vax__) || defined(tahoe)
 #				define BMAX 1e13
 #			else
 #				define BMAX 1e100
-#			endif /* defined(vax) || defined(tahoe) */
+#			endif /* defined(__vax__) || defined(tahoe) */
 			if (b > BMAX) {
 				a /= b;
 				t /= b;
diff --git a/lib/libm/noieee_src/n_lgamma.c b/lib/libm/noieee_src/n_lgamma.c
index 1833e956fad..34254ae44d8 100644
--- a/lib/libm/noieee_src/n_lgamma.c
+++ b/lib/libm/noieee_src/n_lgamma.c
@@ -71,7 +71,7 @@ static char sccsid[] = "@(#)lgamma.c	8.2 (Berkeley) 11/30/93";
  *	NaN			returns NaN
 */
 static int endian;
-#if defined(vax) || defined(tahoe)
+#if defined(__vax__) || defined(tahoe)
 #define _IEEE		0
 /* double and float have same size exponent field */
 #define TRUNC(x)	x = (double) (float) (x)
diff --git a/lib/libm/noieee_src/n_log.c b/lib/libm/noieee_src/n_log.c
index 80f17aa364b..8af5204c40f 100644
--- a/lib/libm/noieee_src/n_log.c
+++ b/lib/libm/noieee_src/n_log.c
@@ -76,7 +76,7 @@ static char sccsid[] = "@(#)log.c	8.2 (Berkeley) 11/30/93";
  *	+Inf	return +Inf
 */
 
-#if defined(vax) || defined(tahoe)
+#if defined(__vax__) || defined(tahoe)
 #define _IEEE		0
 #define TRUNC(x)	x = (double) (float) (x)
 #else
diff --git a/lib/libm/noieee_src/n_log10.c b/lib/libm/noieee_src/n_log10.c
index e2d626d20fe..b955c17c666 100644
--- a/lib/libm/noieee_src/n_log10.c
+++ b/lib/libm/noieee_src/n_log10.c
@@ -88,9 +88,9 @@ ic(ivln10, 4.3429448190325181667E-1, -2, 1.BCB7B1526E50E)
 double log10(x)
 double x;
 {
-#if defined(vax)||defined(tahoe)
+#if defined(__vax__)||defined(tahoe)
 	return(log(x)/ln10hi);
-#else	/* defined(vax)||defined(tahoe) */
+#else	/* defined(__vax__)||defined(tahoe) */
 	return(ivln10*log(x));
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
 }
diff --git a/lib/libm/noieee_src/n_log1p.c b/lib/libm/noieee_src/n_log1p.c
index 84269043f0c..c3ec4acf3bc 100644
--- a/lib/libm/noieee_src/n_log1p.c
+++ b/lib/libm/noieee_src/n_log1p.c
@@ -120,9 +120,9 @@ double x;
 	double z,s,t,c;
 	int k;
 
-#if !defined(vax)&&!defined(tahoe)
+#if !defined(__vax__)&&!defined(tahoe)
 	if(x!=x) return(x);	/* x is NaN */
-#endif	/* !defined(vax)&&!defined(tahoe) */
+#endif	/* !defined(__vax__)&&!defined(tahoe) */
 
 	if(finite(x)) {
 	   if( x > negone ) {
@@ -146,18 +146,18 @@ double x;
 	/* end of if (x > negone) */
 
 	    else {
-#if defined(vax)||defined(tahoe)
+#if defined(__vax__)||defined(tahoe)
 		if ( x == negone )
 		    return (infnan(-ERANGE));	/* -INF */
 		else
 		    return (infnan(EDOM));	/* NaN */
-#else	/* defined(vax)||defined(tahoe) */
+#else	/* defined(__vax__)||defined(tahoe) */
 		/* x = -1, return -INF with signal */
 		if ( x == negone ) return( negone/zero );
 
 		/* negative argument for log, return NaN with signal */
 	        else return ( zero / zero );
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
 	    }
 	}
     /* end of if (finite(x)) */
diff --git a/lib/libm/noieee_src/n_log__L.c b/lib/libm/noieee_src/n_log__L.c
index 977c82d1ba2..e2232c71caa 100644
--- a/lib/libm/noieee_src/n_log__L.c
+++ b/lib/libm/noieee_src/n_log__L.c
@@ -103,9 +103,9 @@ ic(L7, 1.4795612545334174692E-1, -3, 1.2F039F0085122)
 double __log__L(z)
 double z;
 {
-#if defined(vax)||defined(tahoe)
+#if defined(__vax__)||defined(tahoe)
     return(z*(L1+z*(L2+z*(L3+z*(L4+z*(L5+z*(L6+z*(L7+z*L8))))))));
-#else	/* defined(vax)||defined(tahoe) */
+#else	/* defined(__vax__)||defined(tahoe) */
     return(z*(L1+z*(L2+z*(L3+z*(L4+z*(L5+z*(L6+z*L7)))))));
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
 }
diff --git a/lib/libm/noieee_src/n_pow.c b/lib/libm/noieee_src/n_pow.c
index ed8b5384a58..6d7198fb258 100644
--- a/lib/libm/noieee_src/n_pow.c
+++ b/lib/libm/noieee_src/n_pow.c
@@ -110,7 +110,7 @@ static char sccsid[] = "@(#)pow.c	8.1 (Berkeley) 6/4/93";
 
 #include "mathimpl.h"
 
-#if (defined(vax) || defined(tahoe))
+#if (defined(__vax__) || defined(tahoe))
 #define TRUNC(x)	x = (double) (float) x
 #define _IEEE		0
 #else
diff --git a/lib/libm/noieee_src/n_sinh.c b/lib/libm/noieee_src/n_sinh.c
index d97f90598cf..831d63824fe 100644
--- a/lib/libm/noieee_src/n_sinh.c
+++ b/lib/libm/noieee_src/n_sinh.c
@@ -92,11 +92,11 @@ ic(lnovfl, 7.0978271289338397310E2,     9, 1.62E42FEFA39EF)
 #define	lnovfl	vccast(lnovfl)
 #endif
 
-#if defined(vax)||defined(tahoe)
+#if defined(__vax__)||defined(tahoe)
 static max = 126                      ;
-#else	/* defined(vax)||defined(tahoe) */
+#else	/* defined(__vax__)||defined(tahoe) */
 static max = 1023                     ;
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
 
 
 double sinh(x)
@@ -104,9 +104,9 @@ double x;
 {
 	static const double  one=1.0, half=1.0/2.0 ;
 	double t, sign;
-#if !defined(vax)&&!defined(tahoe)
+#if !defined(__vax__)&&!defined(tahoe)
 	if(x!=x) return(x);	/* x is NaN */
-#endif	/* !defined(vax)&&!defined(tahoe) */
+#endif	/* !defined(__vax__)&&!defined(tahoe) */
 	sign=copysign(one,x);
 	x=copysign(x,one);
 	if(x<lnovfl)
diff --git a/lib/libm/noieee_src/n_support.c b/lib/libm/noieee_src/n_support.c
index 15d6fd9cdc4..248996cece0 100644
--- a/lib/libm/noieee_src/n_support.c
+++ b/lib/libm/noieee_src/n_support.c
@@ -76,16 +76,16 @@ static char sccsid[] = "@(#)support.c	8.1 (Berkeley) 6/4/93";
 
 #include "mathimpl.h"
 
-#if defined(vax)||defined(tahoe)      /* VAX D format */
+#if defined(__vax__)||defined(tahoe)      /* VAX D format */
 #include <errno.h>
     static const unsigned short msign=0x7fff , mexp =0x7f80 ;
     static const short  prep1=57, gap=7, bias=129           ;   
     static const double novf=1.7E38, nunf=3.0E-39, zero=0.0 ;
-#else	/* defined(vax)||defined(tahoe) */
+#else	/* defined(__vax__)||defined(tahoe) */
     static const unsigned short msign=0x7fff, mexp =0x7ff0  ;
     static const short prep1=54, gap=4, bias=1023           ;
     static const double novf=1.7E308, nunf=3.0E-308,zero=0.0;
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
 
 double scalb(x,N)
 double x; int N;
@@ -100,19 +100,19 @@ double x; int N;
 
         if( x == zero )  return(x); 
 
-#if defined(vax)||defined(tahoe)
+#if defined(__vax__)||defined(tahoe)
         if( (k= *px & mexp ) != ~msign ) {
             if (N < -260)
 		return(nunf*nunf);
 	    else if (N > 260) {
 		return(copysign(infnan(ERANGE),x));
 	    }
-#else	/* defined(vax)||defined(tahoe) */
+#else	/* defined(__vax__)||defined(tahoe) */
         if( (k= *px & mexp ) != mexp ) {
             if( N<-2100) return(nunf*nunf); else if(N>2100) return(novf+novf);
             if( k == 0 ) {
                  x *= scalb(1.0,(int)prep1);  N -= prep1; return(scalb(x,N));}
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
 
             if((k = (k>>gap)+ N) > 0 )
                 if( k < (mexp>>gap) ) *px = (*px&~mexp) | (k<<gap);
@@ -139,9 +139,9 @@ double x,y;
                         *py=(unsigned short *) &y;
 #endif	/* national */
 
-#if defined(vax)||defined(tahoe)
+#if defined(__vax__)||defined(tahoe)
         if ( (*px & mexp) == 0 ) return(x);
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
 
         *px = ( *px & msign ) | ( *py & ~msign );
         return(x);
@@ -157,9 +157,9 @@ double x;
         short *px=(short *) &x, k;
 #endif	/* national */
 
-#if defined(vax)||defined(tahoe)
+#if defined(__vax__)||defined(tahoe)
         return (int)(((*px&mexp)>>gap)-bias);
-#else	/* defined(vax)||defined(tahoe) */
+#else	/* defined(__vax__)||defined(tahoe) */
         if( (k= *px & mexp ) != mexp )
             if ( k != 0 )
                 return ( (k>>gap) - bias );
@@ -171,21 +171,21 @@ double x;
             return(x);
         else
             {*px &= msign; return(x);}
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
 }
 
 finite(x)
 double x;    
 {
-#if defined(vax)||defined(tahoe)
+#if defined(__vax__)||defined(tahoe)
         return(1);
-#else	/* defined(vax)||defined(tahoe) */
+#else	/* defined(__vax__)||defined(tahoe) */
 #ifdef national
         return( (*((short *) &x+3 ) & mexp ) != mexp );
 #else	/* national */
         return( (*((short *) &x ) & mexp ) != mexp );
 #endif	/* national */
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
 }
 
 double drem(x,p)
@@ -210,25 +210,25 @@ double x,p;
 
         *pp &= msign ;
 
-#if defined(vax)||defined(tahoe)
+#if defined(__vax__)||defined(tahoe)
         if( ( *px & mexp ) == ~msign )	/* is x a reserved operand? */
-#else	/* defined(vax)||defined(tahoe) */
+#else	/* defined(__vax__)||defined(tahoe) */
         if( ( *px & mexp ) == mexp )
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
 		return  (x-p)-(x-p);	/* create nan if x is inf */
 	if (p == zero) {
-#if defined(vax)||defined(tahoe)
+#if defined(__vax__)||defined(tahoe)
 		return(infnan(EDOM));
-#else	/* defined(vax)||defined(tahoe) */
+#else	/* defined(__vax__)||defined(tahoe) */
 		return zero/zero;
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
 	}
 
-#if defined(vax)||defined(tahoe)
+#if defined(__vax__)||defined(tahoe)
         if( ( *pp & mexp ) == ~msign )	/* is p a reserved operand? */
-#else	/* defined(vax)||defined(tahoe) */
+#else	/* defined(__vax__)||defined(tahoe) */
         if( ( *pp & mexp ) == mexp )
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
 		{ if (p != p) return p; else return x;}
 
         else  if ( ((*pp & mexp)>>gap) <= 1 ) 
@@ -248,20 +248,20 @@ double x,p;
                         tmp = dp ;
                         *pt += k ;
 
-#if defined(vax)||defined(tahoe)
+#if defined(__vax__)||defined(tahoe)
                         if( x < tmp ) *pt -= 128 ;
-#else	/* defined(vax)||defined(tahoe) */
+#else	/* defined(__vax__)||defined(tahoe) */
                         if( x < tmp ) *pt -= 16 ;
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
 
                         x -= tmp ;
                     }
                 if ( x > hp )
                     { x -= p ;  if ( x >= hp ) x -= p ; }
 
-#if defined(vax)||defined(tahoe)
+#if defined(__vax__)||defined(tahoe)
 		if (x)
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
 			*px ^= sign;
                 return( x);
 
@@ -276,22 +276,22 @@ double x;
         double t;
 	double const zero=0.0;
         int m,n,i;
-#if defined(vax)||defined(tahoe)
+#if defined(__vax__)||defined(tahoe)
         int k=54;
-#else	/* defined(vax)||defined(tahoe) */
+#else	/* defined(__vax__)||defined(tahoe) */
         int k=51;
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
 
     /* sqrt(NaN) is NaN, sqrt(+-0) = +-0 */
         if(x!=x||x==zero) return(x);
 
     /* sqrt(negative) is invalid */
         if(x<zero) {
-#if defined(vax)||defined(tahoe)
+#if defined(__vax__)||defined(tahoe)
 		return (infnan(EDOM));	/* NaN */
-#else	/* defined(vax)||defined(tahoe) */
+#else	/* defined(__vax__)||defined(tahoe) */
 		return(zero/zero);
-#endif	/* defined(vax)||defined(tahoe) */
+#endif	/* defined(__vax__)||defined(tahoe) */
 	}
 
     /* sqrt(INF) is INF */
diff --git a/lib/libm/noieee_src/n_tanh.c b/lib/libm/noieee_src/n_tanh.c
index 81145978c96..aabd016c4dc 100644
--- a/lib/libm/noieee_src/n_tanh.c
+++ b/lib/libm/noieee_src/n_tanh.c
@@ -80,9 +80,9 @@ double x;
 	double expm1(), t, copysign(), sign;
 	int finite();
 
-#if !defined(vax)&&!defined(tahoe)
+#if !defined(__vax__)&&!defined(tahoe)
 	if(x!=x) return(x);	/* x is NaN */
-#endif	/* !defined(vax)&&!defined(tahoe) */
+#endif	/* !defined(__vax__)&&!defined(tahoe) */
 
 	sign=copysign(one,x);
 	x=copysign(x,one);