diff options
author | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-11-23 06:09:34 +0000 |
---|---|---|
committer | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-11-23 06:09:34 +0000 |
commit | 1ec6144c1f03890fde6c200b218f847576528705 (patch) | |
tree | 8539c15b5a167da7b8f80b16deff39ce46ae06c5 /gcc | |
parent | 2fea3a2571efdf63e899c41a449df58a6325a041 (diff) | |
download | gcc-1ec6144c1f03890fde6c200b218f847576528705.tar.gz |
* 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
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ChangeLog | 7 | ||||
-rw-r--r-- | gcc/config/i386/xm-i386.h | 4 | ||||
-rw-r--r-- | gcc/libgcc2.c | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c11e1a25278..e19a9e1c1b5 100644 --- 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 acc16576709..bb0c34e507b 100644 --- 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 114ada21f61..861e6d98ca5 100644 --- 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 |