diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 54de38cbf886be8e47b1fc6d4e928e6f92e76f8f..0b3248052f16bc9687cdcccc97debd7163b719a1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2003-09-03 Bernardo Innocenti <bernie@develer.com>
+
+ * config.gcc (m68k-*-linux*): Remove definition of LINUX_DEFAULT_ELF.
+ * config/i370/linux.h (LINUX_DEFAULT_ELF): Remove unconditional
+ definition and code blocks compiled when not defined.
+ * config/i386/linux.h (LINUX_DEFAULT_ELF): Likewise.
+ * config/i386/linux64.h (LINUX_DEFAULT_ELF): Likewise.
+ * config/sparc/linux.h: (LINUX_DEFAULT_ELF): Likewise.
+ * config/sparc/linux64.h: (LINUX_DEFAULT_ELF): Likewise.
+
2003-09-03 Jeff Sturm <jsturm@one-point.com>
* cgraphunit.c (visited_nodes): New static variable.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 9018485be4fd0995a28dae50e9c2186dfa65ebf9..e6635f7480f3dee903eb62dcaa8f56817fabbf2e 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1293,7 +1293,7 @@ m68k-*-linux*) # Motorola m68k's running GNU/Linux
# with ELF format using glibc 2
# aka the GNU/Linux C library 6.
tm_file="m68k/m68k.h dbxelf.h elfos.h svr4.h linux.h m68k/linux.h"
- tm_defines="MOTOROLA USE_GAS LINUX_DEFAULT_ELF"
+ tm_defines="MOTOROLA USE_GAS"
tmake_file="t-slibgcc-elf-ver t-linux"
;;
m68k-*-rtems*)
diff --git a/gcc/config/i370/linux.h b/gcc/config/i370/linux.h
index abf1a021819129d3223e1742bbe27928b26f3feb..adc141059472e2a9a98a229ab3fd908a657fca2d 100644
--- a/gcc/config/i370/linux.h
+++ b/gcc/config/i370/linux.h
@@ -27,7 +27,6 @@ Boston, MA 02111-1307, USA. */
/* Specify that we're generating code for a Linux port to 370 */
#define TARGET_ELF_ABI
-#define LINUX_DEFAULT_ELF
/* Target OS preprocessor built-ins. */
#define TARGET_OS_CPP_BUILTINS() \
diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
index 98a25a95eaf226ea62f8b3f8024d90b309ec1096..c199fb3ce8f84e3b591729e201bb38eced54eca2 100644
--- a/gcc/config/i386/linux.h
+++ b/gcc/config/i386/linux.h
@@ -21,8 +21,6 @@ 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. */
-#define LINUX_DEFAULT_ELF
-
/* Output at beginning of assembler file. */
/* The .file command should always begin the output. */
#define TARGET_ASM_FILE_START_FILE_DIRECTIVE true
@@ -115,15 +113,6 @@ Boston, MA 02111-1307, USA. */
#undef LINK_SPEC
#ifdef USE_GNULIBC_1
-#ifndef LINUX_DEFAULT_ELF
-#define LINK_SPEC "-m elf_i386 %{shared:-shared} \
- %{!shared: \
- %{!ibcs: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
- %{!dynamic-linker:-dynamic-linker /lib/elf/ld-linux.so.1} \
- %{!rpath:-rpath /lib/elf/}} %{static:-static}}}"
-#else
#define LINK_SPEC "-m elf_i386 %{shared:-shared} \
%{!shared: \
%{!ibcs: \
@@ -131,7 +120,6 @@ Boston, MA 02111-1307, USA. */
%{rdynamic:-export-dynamic} \
%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.1}} \
%{static:-static}}}"
-#endif
#else
#define LINK_SPEC "-m elf_i386 %{shared:-shared} \
%{!shared: \
diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
index 582a22bacd4f0e4f912865891ccaf5a17126042d..ea329803322f0846e95861f7032e0a4416fb2e13 100644
--- a/gcc/config/i386/linux64.h
+++ b/gcc/config/i386/linux64.h
@@ -19,8 +19,6 @@ 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. */
-#define LINUX_DEFAULT_ELF
-
#define TARGET_VERSION fprintf (stderr, " (x86-64 Linux/ELF)");
#define TARGET_OS_CPP_BUILTINS() \
diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
index a7a48e60c2d932597a908493d2b9522afb286794..87d3a700b4f92c345636c057bf27e264559433e6 100644
--- a/gcc/config/sparc/linux.h
+++ b/gcc/config/sparc/linux.h
@@ -30,8 +30,6 @@ Boston, MA 02111-1307, USA. */
} \
while (0)
-#define LINUX_DEFAULT_ELF
-
/* Don't assume anything about the header files. */
#define NO_IMPLICIT_EXTERN_C
@@ -154,15 +152,6 @@ Boston, MA 02111-1307, USA. */
#undef LINK_SPEC
#ifdef USE_GNULIBC_1
-#ifndef LINUX_DEFAULT_ELF
-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
- %{!shared: \
- %{!ibcs: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
- %{!dynamic-linker:-dynamic-linker /lib/elf/ld-linux.so.1} \
- %{!rpath:-rpath /lib/elf/}} %{static:-static}}}"
-#else
#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
%{!shared: \
%{!ibcs: \
@@ -170,7 +159,6 @@ Boston, MA 02111-1307, USA. */
%{rdynamic:-export-dynamic} \
%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.1}} \
%{static:-static}}}"
-#endif
#else
#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
%{!mno-relax:%{!r:-relax}} \
diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h
index 10c83960b3812c64815757e08facdc5ccebc01be..f85d4aa0a8014522fdf5e1249a54dbad82aa9a8f 100644
--- a/gcc/config/sparc/linux64.h
+++ b/gcc/config/sparc/linux64.h
@@ -31,8 +31,6 @@ Boston, MA 02111-1307, USA. */
} \
while (0)
-#define LINUX_DEFAULT_ELF
-
/* Don't assume anything about the header files. */
#define NO_IMPLICIT_EXTERN_C