[llvm-commits] CVS: gcc-3.4/gcc/config/i386/linux.h t-netware xm-vsta.h

[John Criswell]

Changes in directory gcc-3.4/gcc/config/i386:

linux.h updated: 1.2 -> 1.3
t-netware (r1.1.1.1) removed
xm-vsta.h (r1.1.1.1) removed

---
Log message:

Commit of merge from September 24, 2003 of mainline GCC.  This merge now
works reasonably on Linux/x86 and probably works on Solaris/Sparc.



---
Diffs of the changes:  (+0 -12)

Index: gcc-3.4/gcc/config/i386/linux.h
diff -u gcc-3.4/gcc/config/i386/linux.h:1.2 gcc-3.4/gcc/config/i386/linux.h:1.3
--- gcc-3.4/gcc/config/i386/linux.h:1.2	Thu Jan  8 17:03:36 2004
+++ gcc-3.4/gcc/config/i386/linux.h	Thu Feb  5 10:05:46 2004
@@ -21,8 +21,6 @@
 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 @@
 
 #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 @@
 	%{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: \