* xm-i386.h: Define `__i386__' if not defined, rather than `i386'

        which is in the user's namespace.
        * libgcc2.c: Look for the ANSI-C approved `__i386__' symbol, vs.
        `i386' which is not in our namespace.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@30627 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c11e1a2..e19a9e1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+Mon Nov 22 23:09:44 1999  David O'Brien  <obrien@FreeBSD.org>
+
+        * xm-i386.h: Define `__i386__' if not defined, rather than `i386'
+       which is in the user's namespace.
+        * libgcc2.c: Look for the ANSI-C approved `__i386__' symbol, vs.
+        `i386' which is not in our namespace.
+
 Mon Nov 22 22:58:01 1999  "R. Kelley Cook" <KelleyCook@attglobal.net>
 
        * invoke.texi (ARM Options): Add in -mno-alignment-traps

diff --git a/gcc/config/i386/xm-i386.h b/gcc/config/i386/xm-i386.h
index acc1657..bb0c34e 100644 (file)
--- a/gcc/config/i386/xm-i386.h
+++ b/gcc/config/i386/xm-i386.h
@@ -18,8 +18,8 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#ifndef i386
-#define i386
+#ifndef __i386__
+#define __i386__
 #endif
 
 /* #defines that need visibility everywhere.  */

diff --git a/gcc/libgcc2.c b/gcc/libgcc2.c
index 114ada2..861e6d9 100644 (file)
--- a/gcc/libgcc2.c
+++ b/gcc/libgcc2.c
@@ -2596,7 +2596,7 @@ long getpagesize()
 #endif
 }
 
-#ifdef i386
+#ifdef __i386__
 extern int VirtualProtect (char *, int, int, int *) __attribute__((stdcall));
 #endif