diff options
| author | Geoffrey Keating <geoffk@apple.com> | 2006-12-13 09:28:16 +0000 |
|---|---|---|
| committer | Geoffrey Keating <geoffk@gcc.gnu.org> | 2006-12-13 09:28:16 +0000 |
| commit | 2989d30c128bbbe1d8f671e1bbec6d530d7c0441 (patch) | |
| tree | 2d6da3f3f03804cad64c9d8982687a0dd7a9cb42 /gcc/ada | |
| parent | 4d9f4c465bfe7f70e946d2397e1d05496885ad3d (diff) | |
| download | gcc-2989d30c128bbbe1d8f671e1bbec6d530d7c0441.zip gcc-2989d30c128bbbe1d8f671e1bbec6d530d7c0441.tar.gz gcc-2989d30c128bbbe1d8f671e1bbec6d530d7c0441.tar.bz2 | |
mips-tdump.c: Replace CROSS_COMPILE with CROSS_DIRECTORY_STRUCTURE.
* mips-tdump.c: Replace CROSS_COMPILE with
CROSS_DIRECTORY_STRUCTURE.
* mips-tfile.c: Likewise.
* gcc.c: Likewise.
* configure.ac: Likewise.
* cppdefault.c: Likewise.
* Makefile.in: Likewise.
* config/alpha/osf.h: Likewise.
* config/i386/cygwin.h: Likewise.
* config/i386/beos-elf.h: Likewise.
* config/i386/nto.h: Likewise.
* config/fr30/fr30.h: Likewise.
* config/svr4.h: Likewise.
* config/rs6000/aix.h: Likewise.
* config/rs6000/sysv4.h: Likewise.
* config/pa/pa64-hpux.h: Likewise.
* config/pa/pa-hpux10.h: Likewise.
* config/pa/pa-hpux11.h: Likewise.
* collect2.c: Likewise.
* configure: Regenerate.
From-SVN: r119820
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/Makefile.in | 3 | ||||
| -rw-r--r-- | gcc/ada/adaint.c | 10 |
3 files changed, 12 insertions, 6 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 772de58..e8361c2 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2006-12-07 Geoffrey Keating <geoffk@apple.com> + + * Makefile.in: Replace CROSS_COMPILE with CROSS_DIRECTORY_STRUCTURE. + * adaint.c: Likewise. + 2006-12-05 Aldy Hernandez <aldyh@redhat.com> Merge from gimple-tuples-branch. diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in index 760d425..a0fb0ed 100644 --- a/gcc/ada/Makefile.in +++ b/gcc/ada/Makefile.in @@ -228,7 +228,8 @@ all.indirect: Makefile ../gnat1$(exeext) # IN_GCC distinguishes between code compiled into GCC itself and other # programs built during a bootstrap. -# autoconf inserts -DCROSS_COMPILE if we are building a cross compiler. +# autoconf inserts -DCROSS_DIRECTORY_STRUCTURE if we are building a cross +# compiler which does not use the native libraries and headers. INTERNAL_CFLAGS = @CROSS@ -DIN_GCC # This is the variable actually used when we compile. diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c index 8705a93..dd2e0d6 100644 --- a/gcc/ada/adaint.c +++ b/gcc/ada/adaint.c @@ -197,7 +197,7 @@ struct vstring #endif /* Check for cross-compilation */ -#ifdef CROSS_COMPILE +#ifdef CROSS_DIRECTORY_STRUCTURE int __gnat_is_cross_compiler = 1; #else int __gnat_is_cross_compiler = 0; @@ -614,7 +614,7 @@ __gnat_get_debuggable_suffix_ptr (int *len, const char **value) FILE * __gnat_fopen (char *path, char *mode) { -#if defined (_WIN32) && ! defined (__vxworks) && ! defined (CROSS_COMPILE) +#if defined (_WIN32) && ! defined (__vxworks) && ! defined (CROSS_DIRECTORY_STRUCTURE) TCHAR wpath[GNAT_MAX_PATH_LEN]; TCHAR wmode[10]; @@ -630,7 +630,7 @@ __gnat_fopen (char *path, char *mode) FILE * __gnat_freopen (char *path, char *mode, FILE *stream) { -#if defined (_WIN32) && ! defined (__vxworks) && ! defined (CROSS_COMPILE) +#if defined (_WIN32) && ! defined (__vxworks) && ! defined (CROSS_DIRECTORY_STRUCTURE) TCHAR wpath[GNAT_MAX_PATH_LEN]; TCHAR wmode[10]; @@ -1402,7 +1402,7 @@ __gnat_get_libraries_from_registry (void) { char *result = (char *) ""; -#if defined (_WIN32) && ! defined (__vxworks) && ! defined (CROSS_COMPILE) +#if defined (_WIN32) && ! defined (__vxworks) && ! defined (CROSS_DIRECTORY_STRUCTURE) HKEY reg_key; DWORD name_size, value_size; @@ -2604,7 +2604,7 @@ _flush_cache() } #endif -#if defined (CROSS_COMPILE) \ +#if defined (CROSS_DIRECTORY_STRUCTURE) \ || (! ((defined (sparc) || defined (i386)) && defined (sun) \ && defined (__SVR4)) \ && ! (defined (linux) && (defined (i386) || defined (__x86_64__))) \ |