diff options
| author | cvs2svn <cvs2svn@FreeBSD.org> | 1999-01-21 00:55:32 +0000 |
|---|---|---|
| committer | cvs2svn <cvs2svn@FreeBSD.org> | 1999-01-21 00:55:32 +0000 |
| commit | 76b5366091f76c9bc73570149ef5055648fc2c39 (patch) | |
| tree | 590d020e0f2a5bea6e09d66d951a674443b21d67 /contrib/gcc | |
| parent | 4b4d01da6f07f7754ff6a6e4f5223e9f0984d1a6 (diff) | |
Diffstat (limited to 'contrib/gcc')
| -rw-r--r-- | contrib/gcc/config/i386/freebsd.h | 2 | ||||
| -rw-r--r-- | contrib/gcc/config/i386/freebsd.h.fixed | 2 | ||||
| -rw-r--r-- | contrib/gcc/gcc.1 | 4 | ||||
| -rw-r--r-- | contrib/gcc/gcc.c | 4 |
4 files changed, 8 insertions, 4 deletions
diff --git a/contrib/gcc/config/i386/freebsd.h b/contrib/gcc/config/i386/freebsd.h index e610b5fb8769e..d55c8f814d213 100644 --- a/contrib/gcc/config/i386/freebsd.h +++ b/contrib/gcc/config/i386/freebsd.h @@ -477,7 +477,7 @@ do { \ #endif /* FREEBSD_NATIVE */ #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__FreeBSD_cc_version=300001 -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" +#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" #undef CPP_SPEC #if TARGET_CPU_DEFAULT == 2 diff --git a/contrib/gcc/config/i386/freebsd.h.fixed b/contrib/gcc/config/i386/freebsd.h.fixed index e610b5fb8769e..d55c8f814d213 100644 --- a/contrib/gcc/config/i386/freebsd.h.fixed +++ b/contrib/gcc/config/i386/freebsd.h.fixed @@ -477,7 +477,7 @@ do { \ #endif /* FREEBSD_NATIVE */ #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__FreeBSD_cc_version=300001 -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" +#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" #undef CPP_SPEC #if TARGET_CPU_DEFAULT == 2 diff --git a/contrib/gcc/gcc.1 b/contrib/gcc/gcc.1 index 36ca556376c14..f1a72e6de3461 100644 --- a/contrib/gcc/gcc.1 +++ b/contrib/gcc/gcc.1 @@ -525,12 +525,12 @@ in the following sections. .TP .BI "\-pthread" Link a user-threaded process against libc_r instead of libc. Objects linked -into user-threaded processes should be compiled with -D_THREAD_SAFE. +into user-threaded processes should be compiled with -D_THREADSAFE. .TP .BI "\-kthread" Link a kernel-threaded process against libpthread in addition to libc. Objects linked into kernel-threaded processes should be compiled with --D_THREAD_SAFE. +-D_THREADSAFE. .SH OVERALL OPTIONS .TP .BI "\-x " "language" diff --git a/contrib/gcc/gcc.c b/contrib/gcc/gcc.c index b7a55ea275e7f..fa9d5c0212f37 100644 --- a/contrib/gcc/gcc.c +++ b/contrib/gcc/gcc.c @@ -2328,8 +2328,12 @@ struct infile }; #if defined(FREEBSD_NATIVE) && defined(__i386__) +#if defined(FREEBSD_AOUT) +static int objformat_aout = 1; /* set default format in absense of */ +#else /* any other hints. */ static int objformat_aout = 0; #endif +#endif /* Also a vector of input files specified. */ |