Date: Thu, 30 May 2002 00:56:50 -0700 From: Alfred Perlstein <bright@mu.org> To: arch@freebsd.org Cc: obrien@freebsd.org, markm@freebsd.org, darrenr@freebsd.org, christos@netbsd.org, peter@freebsd.org Subject: defined(i386) -> defined(__i386__) Message-ID: <20020530075650.GM17045@elvis.mu.org>
next in thread | raw e-mail | index | archive | help
I think I've got all the cases where we need to fix i386 -> __i386__
however, there's some bogons in contrib'ified code.
I need help contacting authors or permission to commit to contrib.
Here's what appears to need fixing and who I've contacted via CC'.
Index: contrib/bind/include/arpa/nameser_compat.h (??? peter?)
Index: contrib/ipfilter/ipsend/ip_var.h (darrenr)
Index: contrib/tcsh/tc.wait.h (christos)
Index: crypto/heimdal/lib/des/des_locl.h (markm)
Index: crypto/heimdal/lib/des/des_locl.org (markm)
Index: crypto/kerberosIV/lib/rxkad/rxk_crpt.c (markm)
Index: crypto/openssl/crypto/opensslconf.h (markm)
Index: gnu/include/values.h (obrien)
Index: secure/lib/libcrypto/opensslconf-i386.h (markm)
Here's the diff.
Index: contrib/bind/include/arpa/nameser_compat.h
===================================================================
RCS file: /home/ncvs/src/contrib/bind/include/arpa/nameser_compat.h,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 nameser_compat.h
--- contrib/bind/include/arpa/nameser_compat.h 4 Feb 2002 19:12:36 -0000 1.1.1.3
+++ contrib/bind/include/arpa/nameser_compat.h 30 May 2002 07:52:33 -0000
@@ -51,7 +51,7 @@
#define BIG_ENDIAN 4321 /* most-significant byte first (IBM, net) */
#define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long (pdp)*/
-#if defined(vax) || defined(ns32000) || defined(sun386) || defined(i386) || \
+#if defined(vax) || defined(ns32000) || defined(sun386) || defined(__i386__) || \
defined(MIPSEL) || defined(_MIPSEL) || defined(BIT_ZERO_ON_RIGHT) || \
defined(__alpha__) || defined(__alpha) || \
(defined(__Lynx__) && defined(__x86__))
Index: contrib/ipfilter/ipsend/ip_var.h
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/ipsend/ip_var.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ip_var.h
--- contrib/ipfilter/ipsend/ip_var.h 9 Feb 1997 22:50:02 -0000 1.1.1.1
+++ contrib/ipfilter/ipsend/ip_var.h 30 May 2002 07:22:09 -0000
@@ -44,7 +44,7 @@
* Note: ipf_next must be at same offset as ipq_next above
*/
struct ipasfrag {
-#if defined(vax) || defined(i386)
+#if defined(vax) || defined(i386) || defined(__i386__)
u_char ip_hl:4,
ip_v:4;
#endif
Index: contrib/tcsh/tc.wait.h
===================================================================
RCS file: /home/ncvs/src/contrib/tcsh/tc.wait.h,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 tc.wait.h
--- contrib/tcsh/tc.wait.h 30 Nov 2000 21:05:20 -0000 1.1.1.2
+++ contrib/tcsh/tc.wait.h 30 May 2002 07:07:15 -0000
@@ -98,7 +98,7 @@
# define w_stopval w_S.w_Stopval
# define w_stopsig w_S.w_Stopsig
# else /* _SEQUENT_ */
-# if defined(vax) || defined(i386) || defined(_I386)
+# if defined(vax) || defined(__i386__) || defined(_I386)
union {
struct {
unsigned int w_Termsig:7;
@@ -131,7 +131,7 @@
unsigned int w_Stopval:8;
} w_S;
} w_P;
-# endif /* vax || i386 || _I386 */
+# endif /* vax || __i386__ || _I386 */
};
# define w_termsig w_P.w_T.w_Termsig
Index: crypto/heimdal/lib/des/des_locl.h
===================================================================
RCS file: /home/ncvs/src/crypto/heimdal/lib/des/des_locl.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 des_locl.h
--- crypto/heimdal/lib/des/des_locl.h 21 Jun 2001 02:11:50 -0000 1.1.1.1
+++ crypto/heimdal/lib/des/des_locl.h 30 May 2002 07:23:24 -0000
@@ -167,7 +167,7 @@
#define DES_PTR
#define DES_RISC2
#define DES_UNROLL
-#elif defined( i386 ) /* x86 boxes, should be gcc */
+#elif defined( __i386__ ) /* x86 boxes, should be gcc */
#define DES_PTR
#define DES_RISC1
#define DES_UNROLL
Index: crypto/heimdal/lib/des/des_locl.org
===================================================================
RCS file: /home/ncvs/src/crypto/heimdal/lib/des/des_locl.org,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 des_locl.org
--- crypto/heimdal/lib/des/des_locl.org 21 Jun 2001 02:11:51 -0000 1.1.1.1
+++ crypto/heimdal/lib/des/des_locl.org 30 May 2002 07:23:37 -0000
@@ -141,7 +141,7 @@
#define DES_PTR
#define DES_RISC2
#define DES_UNROLL
-#elif defined( i386 ) /* x86 boxes, should be gcc */
+#elif defined( __i386__ ) /* x86 boxes, should be gcc */
#define DES_PTR
#define DES_RISC1
#define DES_UNROLL
Index: crypto/kerberosIV/lib/rxkad/rxk_crpt.c
===================================================================
RCS file: /home/ncvs/src/crypto/kerberosIV/lib/rxkad/rxk_crpt.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 rxk_crpt.c
--- crypto/kerberosIV/lib/rxkad/rxk_crpt.c 29 Dec 2000 20:59:28 -0000 1.1.1.1
+++ crypto/kerberosIV/lib/rxkad/rxk_crpt.c 30 May 2002 07:24:07 -0000
@@ -71,14 +71,14 @@
#define ROT32L(x, n) ((((u_int32) x) << (n)) | (((u_int32) x) >> (32-(n))))
#define bswap32(x) (((ROT32L(x, 16) & 0x00ff00ff)<<8) | ((ROT32L(x, 16)>>8) & 0x00ff00ff))
-#if defined(__alpha) || defined(i386) || defined(MIPSEL)
+#if defined(__alpha) || defined(__i386__) || defined(MIPSEL)
#define NTOH(x) bswap32(x)
#else
#define NTOH(x) (x)
#endif
#if defined(__GNUC__) && (GNU_ASM == 1)
-#if defined(i386)
+#if defined(__i386__)
#undef ntohl
#define ntohl rxk_ntohl
static inline
@@ -226,7 +226,7 @@
u.l = sched ^ R; \
L ^= sbox0[u.c[0]] ^ sbox1[u.c[1]] ^ sbox2[u.c[2]] ^ sbox3[u.c[3]]; }
-#if defined(i386)
+#if defined(__i386__)
/* BEWARE: this code is endian dependent.
* This should really be inline assembler on the x86.
*/
Index: crypto/openssl/crypto/opensslconf.h
===================================================================
RCS file: /home/ncvs/src/crypto/openssl/crypto/opensslconf.h,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 opensslconf.h
--- crypto/openssl/crypto/opensslconf.h 13 Apr 2000 06:26:05 -0000 1.1.1.2
+++ crypto/openssl/crypto/opensslconf.h 30 May 2002 07:08:47 -0000
@@ -156,7 +156,7 @@
# define DES_PTR
# define DES_RISC2
# define DES_UNROLL
-#elif defined( i386 ) /* x86 boxes, should be gcc */
+#elif defined( __i386__ ) /* x86 boxes, should be gcc */
# define DES_PTR
# define DES_RISC1
# define DES_UNROLL
Index: gnu/include/values.h
===================================================================
RCS file: /home/ncvs/src/gnu/include/values.h,v
retrieving revision 1.4
diff -u -r1.4 values.h
--- gnu/include/values.h 30 May 1995 04:41:37 -0000 1.4
+++ gnu/include/values.h 30 May 2002 07:09:04 -0000
@@ -102,7 +102,7 @@
#define DMAXEXP ((1 << _DEXPLEN - 1) - 1 + _IEEE)
#define FMAXEXP ((1 << _FEXPLEN - 1) - 1 + _IEEE)
-#elif defined(i386)
+#elif defined(__i386__)
#define MAXDOUBLE 1.79769313486231570e+308
#define MAXFLOAT ((float)3.40282346638528860e+38)
#define MINDOUBLE 2.22507385850720140e-308
Index: secure/lib/libcrypto/opensslconf-i386.h
===================================================================
RCS file: /home/ncvs/src/secure/lib/libcrypto/opensslconf-i386.h,v
retrieving revision 1.3
diff -u -r1.3 opensslconf-i386.h
--- secure/lib/libcrypto/opensslconf-i386.h 16 Jul 2000 05:52:52 -0000 1.3
+++ secure/lib/libcrypto/opensslconf-i386.h 30 May 2002 07:25:50 -0000
@@ -164,7 +164,7 @@
# define DES_PTR
# define DES_RISC2
# define DES_UNROLL
-#elif defined( i386 ) /* x86 boxes, should be gcc */
+#elif defined( __i386__ ) /* x86 boxes, should be gcc */
# define DES_PTR
# define DES_RISC1
# define DES_UNROLL
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-arch" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020530075650.GM17045>