[llvm-commits] [llvm-gcc-4.2] r50400 - in /llvm-gcc-4.2/trunk: gcc/config.gcc gcc/config.host gcc/config/i386/t-cygming libstdc++-v3/configure libtool.m4

[Anton Korobeynikov]

Author: asl
Date: Tue Apr 29 01:21:06 2008
New Revision: 50400

URL: http://llvm.org/viewvc/llvm-project?rev=50400&view=rev
Log:
Backport from mainline. Add win64 as target to llvm-gcc.

All win64-related changes were explicitely approved by their
author to be backported to llvm-gcc under GPLv2.

Modified:
    llvm-gcc-4.2/trunk/gcc/config.gcc
    llvm-gcc-4.2/trunk/gcc/config.host
    llvm-gcc-4.2/trunk/gcc/config/i386/t-cygming
    llvm-gcc-4.2/trunk/libstdc++-v3/configure
    llvm-gcc-4.2/trunk/libtool.m4

Modified: llvm-gcc-4.2/trunk/gcc/config.gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config.gcc?rev=50400&r1=50399&r2=50400&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config.gcc (original)
+++ llvm-gcc-4.2/trunk/gcc/config.gcc Tue Apr 29 01:21:06 2008
@@ -1325,22 +1325,30 @@
 	target_gtfiles="\$(srcdir)/config/i386/winnt.c"
 	extra_options="${extra_options} i386/cygming.opt"
 	extra_objs="winnt.o winnt-stubs.o"
-	c_target_objs=cygwin2.o
-	cxx_target_objs="cygwin2.o winnt-cxx.o"
+# LLVM LOCAL begin mainline
+	c_target_objs="cygwin2.o msformat-c.o"
+	cxx_target_objs="cygwin2.o winnt-cxx.o msformat-c.o"
+# LLVM LOCAL end mainline
 	extra_gcc_objs=cygwin1.o
 	extra_parts="crtbegin.o crtend.o"
 	if test x$enable_threads = xyes; then
 		thread_file='posix'
 	fi
 	;;
-i[34567]86-*-mingw32*)
+# LLVM LOCAL begin mainline
+i[34567]86-*-mingw32* | x86_64-*-mingw32*)
+# LLVM LOCAL end mainline
 	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/mingw32.h"
 	xm_file=i386/xm-mingw32.h
 	tmake_file="i386/t-cygming i386/t-mingw32"
 	target_gtfiles="\$(srcdir)/config/i386/winnt.c"
 	extra_options="${extra_options} i386/cygming.opt"
 	extra_objs="winnt.o winnt-stubs.o"
-	cxx_target_objs=winnt-cxx.o
+# LLVM LOCAL begin mainline
+	c_target_objs="msformat-c.o"
+	cxx_target_objs="winnt-cxx.o msformat-c.o"
+	default_use_cxa_atexit=yes
+# LLVM LOCAL end mainline
 	extra_parts="crtbegin.o crtend.o"
 	case ${enable_threads} in
 	  "" | yes | win32)

Modified: llvm-gcc-4.2/trunk/gcc/config.host
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config.host?rev=50400&r1=50399&r2=50400&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config.host (original)
+++ llvm-gcc-4.2/trunk/gcc/config.host Tue Apr 29 01:21:06 2008
@@ -168,7 +168,9 @@
     host_xmake_file="${host_xmake_file} i386/x-cygwin"
     host_exeext=.exe
     ;;
-  i[34567]86-*-mingw32*)
+# LLVM LOCAL begin mainline
+  i[34567]86-*-mingw32* | x86_64-*-mingw32*)
+# LLVM LOCAL end mainline
     host_xm_file=i386/xm-mingw32.h
     host_xmake_file="${host_xmake_file} i386/x-mingw32"
     host_exeext=.exe

Modified: llvm-gcc-4.2/trunk/gcc/config/i386/t-cygming
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/t-cygming?rev=50400&r1=50399&r2=50400&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/t-cygming (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/t-cygming Tue Apr 29 01:21:06 2008
@@ -29,6 +29,14 @@
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
 	$(srcdir)/config/i386/winnt-stubs.c
 
+# LLVM LOCAL begin mainline
+msformat-c.o: $(srcdir)/config/i386/msformat-c.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
+  $(TM_H) $(RTL_H) $(REGS_H) hard-reg-set.h output.h $(TREE_H) flags.h \
+  $(TM_P_H) toplev.h $(HASHTAB_H) $(GGC_H)
+	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+	$(srcdir)/config/i386/msformat-c.c
+# LLVM LOCAL end mainline
+
 STMP_FIXINC=stmp-fixinc
 
 # LLVM LOCAL begin mainline 125696

Modified: llvm-gcc-4.2/trunk/libstdc++-v3/configure
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/libstdc%2B%2B-v3/configure?rev=50400&r1=50399&r2=50400&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/libstdc++-v3/configure (original)
+++ llvm-gcc-4.2/trunk/libstdc++-v3/configure Tue Apr 29 01:21:06 2008
@@ -4207,7 +4207,7 @@
   ;;
 
 cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+  lt_cv_deplibs_check_method='file_magic file format pe*-i386(.*architecture: i386)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
   ;;
 

Modified: llvm-gcc-4.2/trunk/libtool.m4
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/libtool.m4?rev=50400&r1=50399&r2=50400&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/libtool.m4 (original)
+++ llvm-gcc-4.2/trunk/libtool.m4 Tue Apr 29 01:21:06 2008
@@ -663,7 +663,7 @@
   ;;
 
 cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+  lt_cv_deplibs_check_method='file_magic file format pe*-i386(.*architecture: i386)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
   ;;