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
2025-04-04 14:51:06 +08:00 · 2006-12-13 09:28:16 +00:00 · 2006-12-13 09:28:16 +00:00 · 2989d30c12
commit 2989d30c12
parent 4d9f4c465b
23 changed files with 72 additions and 42 deletions
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@ -25,6 +25,27 @@

 2006-12-12  Geoffrey Keating  <geoffk@apple.com>

+	* 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.
+
 	* doc/tm.texi (Alignment Output): Document that ASM_OUTPUT_SKIP
 	actually takes an unsigned HOST_WIDE_INT for its second parameter.

--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@ -820,7 +820,8 @@ REAL_H = real.h $(MACHMODE_H)

 # 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 headers and libraries.
 INTERNAL_CFLAGS = -DIN_GCC @CROSS@

 # This is the variable actually used when we compile. If you change this,
--- 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.
--- 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.
--- 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__))) \
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@ -53,7 +53,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
   the utilities are not correct for a cross-compiler; we have to hope that
   cross-versions are in the proper directories.  */

-#ifdef CROSS_COMPILE
+#ifdef CROSS_DIRECTORY_STRUCTURE
 #undef OBJECT_FORMAT_COFF
 #undef MD_EXEC_PREFIX
 #undef REAL_LD_FILE_NAME
@ -553,7 +553,7 @@ is_ctor_dtor (const char *s)

 static struct path_prefix cpath, path;

-#ifdef CROSS_COMPILE
+#ifdef CROSS_DIRECTORY_STRUCTURE
 /* This is the name of the target machine.  We use it to form the name
   of the files to execute.  */

@ -746,7 +746,7 @@ main (int argc, char **argv)
  static const char *const strip_suffix = "strip";
  static const char *const gstrip_suffix = "gstrip";

-#ifdef CROSS_COMPILE
+#ifdef CROSS_DIRECTORY_STRUCTURE
  /* If we look for a program in the compiler directories, we just use
     the short name, since these directories are already system-specific.
     But it we look for a program in the system directories, we need to
@ -775,7 +775,7 @@ main (int argc, char **argv)
 #endif
  const char *const full_strip_suffix	= strip_suffix;
  const char *const full_gstrip_suffix	= gstrip_suffix;
-#endif /* CROSS_COMPILE */
+#endif /* CROSS_DIRECTORY_STRUCTURE */

  const char *arg;
  FILE *outf;
@ -957,7 +957,7 @@ main (int argc, char **argv)
  c_file_name = getenv ("COLLECT_GCC");
  if (c_file_name == 0)
    {
-#ifdef CROSS_COMPILE
+#ifdef CROSS_DIRECTORY_STRUCTURE
      c_file_name = concat (target_machine, "-gcc", NULL);
 #else
      c_file_name = "gcc";
--- a/gcc/config/alpha/osf.h
+++ b/gcc/config/alpha/osf.h
@ -138,7 +138,7 @@ Boston, MA 02110-1301, USA.  */
 #define SUBTARGET_EXTRA_SPECS { "asm_oldas", ASM_OLDAS_SPEC }

 /* Indicate that we have a stamp.h to use.  */
-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #define HAVE_STAMP_H 1
 #endif

--- a/gcc/config/fr30/fr30.h
+++ b/gcc/config/fr30/fr30.h
@ -1110,7 +1110,7 @@ fprintf (STREAM, "\t.word .L%d\n", VALUE)
 #define FUNCTION_MODE QImode

 /* If cross-compiling, don't require stdio.h etc to build libgcc.a.  */
-#if defined CROSS_COMPILE && ! defined inhibit_libc
+#if defined CROSS_DIRECTORY_STRUCTURE && ! defined inhibit_libc
 #define inhibit_libc
 #endif

--- a/gcc/config/i386/beos-elf.h
+++ b/gcc/config/i386/beos-elf.h
@ -135,7 +135,7 @@ Boston, MA 02110-1301, USA.  */
   for the BeOS include files relative to TOOL_INCLUDE_DIR.  Yes, we
   use ANSI string concatenation here (FIXME) */

-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #undef INCLUDE_DEFAULTS
 #define INCLUDE_DEFAULTS \
    { \
@ -177,7 +177,7 @@ Boston, MA 02110-1301, USA.  */
    { "/boot/develop/headers", 0, 0, 0 }, \
    { 0, 0, 0, 0 } \
    }
-#else /* CROSS_COMPILE */
+#else /* CROSS_DIRECTORY_STRUCTURE */
 #undef	INCLUDE_DEFAULTS
 #define INCLUDE_DEFAULTS				\
    { \
--- a/gcc/config/i386/cygwin.h
+++ b/gcc/config/i386/cygwin.h
@ -146,7 +146,7 @@ char cygwin_tool_include_dir[sizeof (TOOL_INCLUDE_DIR) + 1
 #undef TOOL_INCLUDE_DIR
 #define TOOL_INCLUDE_DIR ((const char *) cygwin_tool_include_dir)

-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #undef STANDARD_INCLUDE_DIR
 #define STANDARD_INCLUDE_DIR "/usr/include"
 char cygwin_standard_include_dir[sizeof (STANDARD_INCLUDE_DIR) + 1
--- a/gcc/config/i386/nto.h
+++ b/gcc/config/i386/nto.h
@ -43,7 +43,7 @@ Boston, MA 02110-1301, USA.  */
 #undef THREAD_MODEL_SPEC
 #define THREAD_MODEL_SPEC "posix"

-#ifdef CROSS_COMPILE
+#ifdef CROSS_DIRECTORY_STRUCTURE
 #define SYSROOT_SUFFIX_SPEC "x86"
 #endif

--- a/gcc/config/pa/pa-hpux10.h
+++ b/gcc/config/pa/pa-hpux10.h
@ -122,7 +122,7 @@ Boston, MA 02110-1301, USA.  */
 /* Under hpux10, the normal location of the `ld' and `as' programs is the
   /usr/ccs/bin directory.  */

-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #undef MD_EXEC_PREFIX
 #define MD_EXEC_PREFIX "/usr/ccs/bin/"
 #endif
@ -131,7 +131,7 @@ Boston, MA 02110-1301, USA.  */
   the /usr/ccs/lib directory.  However, the profiling files are in
   /opt/langtools/lib.  */

-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #undef MD_STARTFILE_PREFIX
 #define MD_STARTFILE_PREFIX "/usr/ccs/lib/"
 #define MD_STARTFILE_PREFIX_1 "/opt/langtools/lib/"
--- a/gcc/config/pa/pa-hpux11.h
+++ b/gcc/config/pa/pa-hpux11.h
@ -147,7 +147,7 @@ Boston, MA 02110-1301, USA.  */
 /* Under hpux11, the normal location of the `ld' and `as' programs is the
   /usr/ccs/bin directory.  */

-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #undef MD_EXEC_PREFIX
 #define MD_EXEC_PREFIX "/usr/ccs/bin/"
 #endif
@ -156,7 +156,7 @@ Boston, MA 02110-1301, USA.  */
   the /usr/ccs/lib directory.  However, the profiling files are in
   /opt/langtools/lib.  */

-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #undef MD_STARTFILE_PREFIX
 #define MD_STARTFILE_PREFIX "/usr/ccs/lib/"
 #define MD_STARTFILE_PREFIX_1 "/opt/langtools/lib/"
--- a/gcc/config/pa/pa64-hpux.h
+++ b/gcc/config/pa/pa64-hpux.h
@ -88,7 +88,7 @@ Boston, MA 02110-1301, USA.  */
 /* Under hpux11, the normal location of the `ld' and `as' programs is the
   /usr/ccs/bin directory.  */

-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #undef MD_EXEC_PREFIX
 #define MD_EXEC_PREFIX "/usr/ccs/bin"
 #endif
@ -105,12 +105,12 @@ Boston, MA 02110-1301, USA.  */
   is the /usr/ccs/lib/pa20_64 directory.  Some files may also be in the
   /opt/langtools/lib/pa20_64 directory.  */

-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #undef MD_STARTFILE_PREFIX
 #define MD_STARTFILE_PREFIX "/usr/ccs/lib/pa20_64/"
 #endif

-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #undef MD_STARTFILE_PREFIX_1
 #define MD_STARTFILE_PREFIX_1 "/opt/langtools/lib/pa20_64/"
 #endif
--- a/gcc/config/rs6000/aix.h
+++ b/gcc/config/rs6000/aix.h
@ -124,14 +124,14 @@
 /* #define ASM_SPEC "-u %(asm_cpu)" */

 /* Default location of syscalls.exp under AIX */
-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #define LINK_SYSCALLS_SPEC "-bI:/lib/syscalls.exp"
 #else
 #define LINK_SYSCALLS_SPEC ""
 #endif

 /* Default location of libg.exp under AIX */
-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #define LINK_LIBG_SPEC "-bexport:/usr/lib/libg.exp"
 #else
 #define LINK_LIBG_SPEC ""
--- a/gcc/config/rs6000/sysv4.h
+++ b/gcc/config/rs6000/sysv4.h
@ -640,7 +640,7 @@ extern int fixuplabelno;
 %{profile: -p}"

 /* Don't put -Y P,<path> for cross compilers.  */
-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #define LINK_PATH_SPEC "\
 %{!R*:%{L*:-R %*}} \
 %{!nostdlib: %{!YP,*: \
--- a/gcc/config/svr4.h
+++ b/gcc/config/svr4.h
@ -84,7 +84,7 @@ Boston, MA 02110-1301, USA.
 /* Under svr4, the normal location of the `ld' and `as' programs is the
   /usr/ccs/bin directory.  */

-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #undef  MD_EXEC_PREFIX
 #define MD_EXEC_PREFIX "/usr/ccs/bin/"
 #endif
@ -92,7 +92,7 @@ Boston, MA 02110-1301, USA.
 /* Under svr4, the normal location of the various *crt*.o files is the
   /usr/ccs/lib directory.  */

-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #undef  MD_STARTFILE_PREFIX
 #define MD_STARTFILE_PREFIX "/usr/ccs/lib/"
 #endif
@ -136,7 +136,7 @@ Boston, MA 02110-1301, USA.
   not being done.  */

 #undef	LINK_SPEC
-#ifdef CROSS_COMPILE
+#ifdef CROSS_DIRECTORY_STRUCTURE
 #define LINK_SPEC "%{h*} %{v:-V} \
 		   %{b} \
 		   %{static:-dn -Bstatic} \
--- a/gcc/configure
+++ b/gcc/configure
@ -13167,7 +13167,8 @@ for f in $build_xm_file; do
  esac
 done

-# Define macro CROSS_COMPILE in compilation if this is a cross-compiler.
+# Define macro CROSS_DIRECTORY_STRUCTURE in compilation if this is a
+# cross-compiler which does not use the native headers and libraries.
 # Also use all.cross instead of all.internal and adjust SYSTEM_HEADER_DIR.
 CROSS=
 ALL=all.internal
@ -13184,7 +13185,7 @@ fi

 if test x$host != x$target
 then
-	CROSS="-DCROSS_COMPILE"
+	CROSS="-DCROSS_DIRECTORY_STRUCTURE"
 	ALL=all.cross
 	SYSTEM_HEADER_DIR=$build_system_header_dir
 	case "$host","$target" in
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@ -1745,7 +1745,8 @@ for f in $build_xm_file; do
  esac
 done

-# Define macro CROSS_COMPILE in compilation if this is a cross-compiler.
+# Define macro CROSS_DIRECTORY_STRUCTURE in compilation if this is a
+# cross-compiler which does not use the native headers and libraries.
 # Also use all.cross instead of all.internal and adjust SYSTEM_HEADER_DIR.
 CROSS=						AC_SUBST(CROSS)
 ALL=all.internal				AC_SUBST(ALL)
@ -1762,7 +1763,7 @@ fi

 if test x$host != x$target
 then
-	CROSS="-DCROSS_COMPILE"
+	CROSS="-DCROSS_DIRECTORY_STRUCTURE"
 	ALL=all.cross
 	SYSTEM_HEADER_DIR=$build_system_header_dir
 	case "$host","$target" in
--- a/gcc/cppdefault.c
+++ b/gcc/cppdefault.c
@ -33,7 +33,7 @@ Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 #define STANDARD_INCLUDE_COMPONENT 0
 #endif

-#if defined (CROSS_COMPILE) && !defined (TARGET_SYSTEM_ROOT)
+#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
 # undef LOCAL_INCLUDE_DIR
 # undef SYSTEM_INCLUDE_DIR
 # undef STANDARD_INCLUDE_DIR
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@ -238,7 +238,7 @@ static const char *spec_machine = DEFAULT_TARGET_MACHINE;
 /* Nonzero if cross-compiling.
   When -b is used, the value comes from the `specs' file.  */

-#ifdef CROSS_COMPILE
+#ifdef CROSS_DIRECTORY_STRUCTURE
 static const char *cross_compile = "1";
 #else
 static const char *cross_compile = "0";
@ -1455,7 +1455,7 @@ static const char *gcc_libexec_prefix;
 #define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
 #endif

-#ifdef CROSS_COMPILE  /* Don't use these prefixes for a cross compiler.  */
+#ifdef CROSS_DIRECTORY_STRUCTURE  /* Don't use these prefixes for a cross compiler.  */
 #undef MD_EXEC_PREFIX
 #undef MD_STARTFILE_PREFIX
 #undef MD_STARTFILE_PREFIX_1
--- a/gcc/mips-tdump.c
+++ b/gcc/mips-tdump.c
@ -29,11 +29,11 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 #ifdef index
 #undef index
 #endif
-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #include <a.out.h>
 #else
 #include "mips/a.out.h"
-#endif /* CROSS_COMPILE */
+#endif /* CROSS_DIRECTORY_STRUCTURE */

 /* Include getopt.h for the sake of getopt_long.  */
 #include "getopt.h"
--- a/gcc/mips-tfile.c
+++ b/gcc/mips-tfile.c
@ -667,11 +667,11 @@ main (void)

 #include <signal.h>

-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #include <a.out.h>
 #else
 #include "mips/a.out.h"
-#endif /* CROSS_COMPILE */
+#endif /* CROSS_DIRECTORY_STRUCTURE */

 #include "gstab.h"