From 72b7f7eaf31282b345ccb4acaa9be52777b5f83c Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 9 Dec 2010 16:31:47 +0000 Subject: [PATCH] nto.h (MD_EXEC_PREFIX, [...]): Define. * config/i386/nto.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): Define. * config/ia64/hpux.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): Define. * config/linux.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): Don't undefine. * config/mips/linux.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): Don't undefine. * config/mips/netbsd.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): Don't undefine. * config/rs6000/linux.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): Don't undefine. * config/rs6000/linux64.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): Don't undefine. * config/sol2.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): Define. * config/sparc/netbsd-elf.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): Don't undefine. * config/sparc/openbsd64.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): Don't undefine. * config/sparc/sp64-elf.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): Don't undefine. * config/svr4.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): Don't define. * config/xtensa/elf.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): Don't undefine. From-SVN: r167647 --- gcc/ChangeLog | 27 +++++++++++++++++++++++++++ gcc/config/i386/nto.h | 8 ++++++++ gcc/config/ia64/hpux.h | 8 ++++++++ gcc/config/linux.h | 3 --- gcc/config/mips/linux.h | 3 --- gcc/config/mips/netbsd.h | 4 ---- gcc/config/rs6000/linux.h | 5 +---- gcc/config/rs6000/linux64.h | 4 ---- gcc/config/sol2.h | 8 ++++++++ gcc/config/sparc/netbsd-elf.h | 4 ---- gcc/config/sparc/openbsd64.h | 3 --- gcc/config/sparc/sp64-elf.h | 3 --- gcc/config/svr4.h | 16 ---------------- gcc/config/xtensa/elf.h | 3 --- 14 files changed, 52 insertions(+), 47 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ca60d29..f444e51 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,32 @@ 2010-12-09 Joseph Myers + * config/i386/nto.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): Define. + * config/ia64/hpux.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): + Define. + * config/linux.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): Don't + undefine. + * config/mips/linux.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): Don't + undefine. + * config/mips/netbsd.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): + Don't undefine. + * config/rs6000/linux.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): + Don't undefine. + * config/rs6000/linux64.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): + Don't undefine. + * config/sol2.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): Define. + * config/sparc/netbsd-elf.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): + Don't undefine. + * config/sparc/openbsd64.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): + Don't undefine. + * config/sparc/sp64-elf.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): + Don't undefine. + * config/svr4.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): Don't + define. + * config/xtensa/elf.h (MD_EXEC_PREFIX, MD_STARTFILE_PREFIX): Don't + undefine. + +2010-12-09 Joseph Myers + * config/ia64/hpux.h (AS_NEEDS_DASH_FOR_PIPED_INPUT): Define for non-GNU assembler. * config/m68k/netbsd-elf.h (AS_NEEDS_DASH_FOR_PIPED_INPUT): diff --git a/gcc/config/i386/nto.h b/gcc/config/i386/nto.h index 040f350..8696abd 100644 --- a/gcc/config/i386/nto.h +++ b/gcc/config/i386/nto.h @@ -46,6 +46,14 @@ along with GCC; see the file COPYING3. If not see #define SYSROOT_SUFFIX_SPEC "x86" #endif +#ifndef CROSS_DIRECTORY_STRUCTURE +#undef MD_EXEC_PREFIX +#define MD_EXEC_PREFIX "/usr/ccs/bin/" + +#undef MD_STARTFILE_PREFIX +#define MD_STARTFILE_PREFIX "/usr/ccs/lib/" +#endif + #undef STARTFILE_SPEC #define STARTFILE_SPEC \ "%{!shared: \ diff --git a/gcc/config/ia64/hpux.h b/gcc/config/ia64/hpux.h index d627f9d..804e0f8 100644 --- a/gcc/config/ia64/hpux.h +++ b/gcc/config/ia64/hpux.h @@ -72,6 +72,14 @@ do { \ #define AS_NEEDS_DASH_FOR_PIPED_INPUT #endif +#ifndef CROSS_DIRECTORY_STRUCTURE +#undef MD_EXEC_PREFIX +#define MD_EXEC_PREFIX "/usr/ccs/bin/" + +#undef MD_STARTFILE_PREFIX +#define MD_STARTFILE_PREFIX "/usr/ccs/lib/" +#endif + #undef ENDFILE_SPEC #undef STARTFILE_SPEC diff --git a/gcc/config/linux.h b/gcc/config/linux.h index 4f3b4b8..1c4ea1c 100644 --- a/gcc/config/linux.h +++ b/gcc/config/linux.h @@ -34,9 +34,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #undef ASM_APP_OFF #define ASM_APP_OFF "#NO_APP\n" -#undef MD_EXEC_PREFIX -#undef MD_STARTFILE_PREFIX - /* Provide a STARTFILE_SPEC appropriate for GNU/Linux. Here we add the GNU/Linux magical crtbegin.o file (see crtstuff.c) which provides part of the support for getting C++ file-scope static diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h index c72d660..4f649d5 100644 --- a/gcc/config/mips/linux.h +++ b/gcc/config/mips/linux.h @@ -34,9 +34,6 @@ along with GCC; see the file COPYING3. If not see #define TARGET_VERSION fprintf (stderr, " (MIPS GNU/Linux with ELF)"); #endif -#undef MD_EXEC_PREFIX -#undef MD_STARTFILE_PREFIX - /* If we don't set MASK_ABICALLS, we can't default to PIC. */ #undef TARGET_DEFAULT #define TARGET_DEFAULT MASK_ABICALLS diff --git a/gcc/config/mips/netbsd.h b/gcc/config/mips/netbsd.h index ff32858..b8f7e76 100644 --- a/gcc/config/mips/netbsd.h +++ b/gcc/config/mips/netbsd.h @@ -126,10 +126,6 @@ along with GCC; see the file COPYING3. If not see while (0) -/* Clean up after the generic MIPS/ELF configuration. */ -#undef MD_EXEC_PREFIX -#undef MD_STARTFILE_PREFIX - /* Extra specs we need. */ #undef SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS \ diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h index c659a3e..464cd8e 100644 --- a/gcc/config/rs6000/linux.h +++ b/gcc/config/rs6000/linux.h @@ -1,7 +1,7 @@ /* Definitions of target machine for GNU compiler, for PowerPC machines running Linux. Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc. Contributed by Michael Meissner (meissner@cygnus.com). This file is part of GCC. @@ -20,9 +20,6 @@ along with GCC; see the file COPYING3. If not see . */ -#undef MD_EXEC_PREFIX -#undef MD_STARTFILE_PREFIX - /* Linux doesn't support saving and restoring 64-bit regs in a 32-bit process. */ #define OS_MISSING_POWERPC64 1 diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h index 694a592..20bd257 100644 --- a/gcc/config/rs6000/linux64.h +++ b/gcc/config/rs6000/linux64.h @@ -304,10 +304,6 @@ extern int dot_symbols; #define BLOCK_REG_PADDING(MODE, TYPE, FIRST) \ (!(FIRST) ? upward : FUNCTION_ARG_PADDING (MODE, TYPE)) -/* Override svr4.h */ -#undef MD_EXEC_PREFIX -#undef MD_STARTFILE_PREFIX - /* Linux doesn't support saving and restoring 64-bit regs in a 32-bit process. */ #define OS_MISSING_POWERPC64 !TARGET_64BIT diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h index 0ad98aa..34911b6 100644 --- a/gcc/config/sol2.h +++ b/gcc/config/sol2.h @@ -120,6 +120,14 @@ along with GCC; see the file COPYING3. If not see %(asm_cpu) \ " +#ifndef CROSS_DIRECTORY_STRUCTURE +#undef MD_EXEC_PREFIX +#define MD_EXEC_PREFIX "/usr/ccs/bin/" + +#undef MD_STARTFILE_PREFIX +#define MD_STARTFILE_PREFIX "/usr/ccs/lib/" +#endif + /* We don't use the standard LIB_SPEC only because we don't yet support c++. */ #undef LIB_SPEC #define LIB_SPEC \ diff --git a/gcc/config/sparc/netbsd-elf.h b/gcc/config/sparc/netbsd-elf.h index 90f48d0..e69934b 100644 --- a/gcc/config/sparc/netbsd-elf.h +++ b/gcc/config/sparc/netbsd-elf.h @@ -36,10 +36,6 @@ along with GCC; see the file COPYING3. If not see } \ while (0) -/* Make sure these are undefined. */ -#undef MD_EXEC_PREFIX -#undef MD_STARTFILE_PREFIX - /* CPP defines used by all NetBSD targets. */ #undef CPP_SUBTARGET_SPEC #define CPP_SUBTARGET_SPEC "%(netbsd_cpp_spec)" diff --git a/gcc/config/sparc/openbsd64.h b/gcc/config/sparc/openbsd64.h index ece43ee..5d87f72 100644 --- a/gcc/config/sparc/openbsd64.h +++ b/gcc/config/sparc/openbsd64.h @@ -47,9 +47,6 @@ along with GCC; see the file COPYING3. If not see #undef CPP_SUBTARGET_SPEC #define CPP_SUBTARGET_SPEC "" -#undef MD_EXEC_PREFIX -#undef MD_STARTFILE_PREFIX - /* Inherited from sp64-elf. */ #undef NO_IMPLICIT_EXTERN_C diff --git a/gcc/config/sparc/sp64-elf.h b/gcc/config/sparc/sp64-elf.h index e1820e0..cbd4474 100644 --- a/gcc/config/sparc/sp64-elf.h +++ b/gcc/config/sparc/sp64-elf.h @@ -38,9 +38,6 @@ along with GCC; see the file COPYING3. If not see #undef CPP_SUBTARGET_SPEC #define CPP_SUBTARGET_SPEC "-D__svr4__" -#undef MD_EXEC_PREFIX -#undef MD_STARTFILE_PREFIX - #undef ASM_SPEC #define ASM_SPEC "\ %{v:-V} -s %{fpic|fPIC|fpie|fPIE:-K PIC} \ diff --git a/gcc/config/svr4.h b/gcc/config/svr4.h index 701428d..40798a4 100644 --- a/gcc/config/svr4.h +++ b/gcc/config/svr4.h @@ -72,22 +72,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #undef ASM_SPEC #define ASM_SPEC SVR4_ASM_SPEC -/* Under svr4, the normal location of the `ld' and `as' programs is the - /usr/ccs/bin directory. */ - -#ifndef CROSS_DIRECTORY_STRUCTURE -#undef MD_EXEC_PREFIX -#define MD_EXEC_PREFIX "/usr/ccs/bin/" -#endif - -/* Under svr4, the normal location of the various *crt*.o files is the - /usr/ccs/lib directory. */ - -#ifndef CROSS_DIRECTORY_STRUCTURE -#undef MD_STARTFILE_PREFIX -#define MD_STARTFILE_PREFIX "/usr/ccs/lib/" -#endif - /* Provide a LIB_SPEC appropriate for svr4. Here we tack on the default standard C library (unless we are building a shared library). */ diff --git a/gcc/config/xtensa/elf.h b/gcc/config/xtensa/elf.h index 0e8364f..9188f30 100644 --- a/gcc/config/xtensa/elf.h +++ b/gcc/config/xtensa/elf.h @@ -29,9 +29,6 @@ along with GCC; see the file COPYING3. If not see #undef ASM_APP_OFF #define ASM_APP_OFF "#NO_APP\n" -#undef MD_EXEC_PREFIX -#undef MD_STARTFILE_PREFIX - #undef TARGET_VERSION #define TARGET_VERSION fputs (" (Xtensa/ELF)", stderr); -- 2.7.4