2006-11-06 Eric Christopher <echristo@apple.com>

	    * config.gcc: Add x86_64-darwin host support.
	    * config.host: Ditto.
	    * config/i386/darwin64.h: New file.
	    * config/i386/t-darwin64: Ditto.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@118541 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 64 insertions, 13 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 165e0373c0c..bfc4826d77b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-06  Eric Christopher  <echristo@apple.com>
+
+	* config.gcc: Add x86_64-darwin host support.
+	* config.host: Ditto.
+	* config/i386/darwin64.h: New file.
+	* config/i386/t-darwin64: Ditto.
+
 2006-11-06  Janis Johnson  <janis187@us.ibm.com>
 
 	* gcc/doc/sourcebuild.texi (Test Directives): Add output-exists
@@ -50,7 +57,7 @@
 	* config/arm/t-arm-coff: Likewise.
 	* config/arm/t-xscale-coff: Likewise.
 	* config/arm/t-wince-pe: Likewise.
-	
+
 2006-11-05  Kaz Kojima  <kkojima@gcc.gnu.org>
 
 	* config/sh/lib1funcs-4-300.asm: Guard entire file with
@@ -141,7 +148,7 @@
 	(arm_override_options): Set arm_default_cpu.
 
 2006-11-03  David Ung  <davidu@mips.com>
-	
+
 	* config/mips/mips.h (processor_type): Removed PROCESSOR_24K, add
 	PROCESSOR_24KC and PROCESSOR_24KF.
 	* config/mips/mips.c (mips_cpu_info_table): Add processor names
@@ -150,8 +157,8 @@
 	* config/mips/mips.md ("cpu"): Remove 24k, add 24kc and 24kf.
 	* config/mips/24k.md: Remove references to 24k and replace with
 	uses of 24kc/24kf in the appropriate reservations.
-	* doc/invoke.texi (MIPS Options): Updated. 
-	
+	* doc/invoke.texi (MIPS Options): Updated.
+
 2006-11-03  J"orn Rennecke  <joern.rennecke@st.com>
 
 	* config/sh/crt1.asm: Fix #ifdef indent.
@@ -252,15 +259,15 @@
 2006-11-02  Carlos O'Donell  <carlos@codesourcery.com>
 
 	* config/arm/linux-elf.h (NEED_INDICATE_EXEC_STACK): Define as 1.
-	* arm.c (arm_file_end): If NEED_INDICATE_EXEC_STACK call 
-	file_end_indicate_exec_stack. 
-	* arm.h [!NEED_INDICATE_EXEC_STACK] (NEED_INIDCATE_EXEC_STACK): 
+	* arm.c (arm_file_end): If NEED_INDICATE_EXEC_STACK call
+	file_end_indicate_exec_stack.
+	* arm.h [!NEED_INDICATE_EXEC_STACK] (NEED_INIDCATE_EXEC_STACK):
 	Define as 0.
 	* lib1funcs.asm [__ELF__ && __linux__]: Emit .note.GNU-stack section
 	for a non-executable stack.
 	* crti.asm: Likewise.
 	* crtn.asm: Likewise.
-	* libunwind.S: Likewise. 
+	* libunwind.S: Likewise.
 
 2006-11-02  Ben Elliston  <bje@au.ibm.com>
 
@@ -473,7 +480,7 @@
 
 	* toplev.c (compile_file): Call final_write_globals
 	even if there have been errors.
-	
+
 2006-10-31  Eric Christopher  <echristo@apple.com>
 	    Falk Hueffner  <falk@debian.org>
 
@@ -672,7 +679,7 @@
 
 2006-10-29  Daniel Berlin  <dberlin@dberlin.org>
 
-	* tree.h (tree_value_handle): Remove struct value_set declaration.	
+	* tree.h (tree_value_handle): Remove struct value_set declaration.
 	Change value_set to bitmap_set.
 	* tree-pretty-print.c (dump_generic_node): Use has_stmt_ann.
 	* tree-vn.c (get_value_handle): Made inline and moved to
@@ -741,7 +748,7 @@
 	(compute_avail): Handle RETURN_EXPR.
 	(init_pre): Modify for bitmapped sets.
 	* tree-flow.h (has_stmt_ann): New function.
-	
+
 2006-10-29  Roger Sayle  <roger@eyesopen.com>
 
 	* builtins.c (fold_builtin_floor): Check for the availability of
@@ -994,7 +1001,7 @@
 
 	* config/i386/i386.c (output_387_ffreep): Create output from a
 	template string for !HAVE_AS_IX86_FFREEP.
-	
+
 2006-10-27  Eric Christopher  <echristo@apple.com>
 
 	* config/darwin.c: Fix formatting and grammar.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index fcdb89c8e71..d1fd076e01c 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1015,6 +1015,12 @@ i[34567]86-*-darwin*)
 	with_arch=${with_arch:-nocona}
 	with_cpu=${with_cpu:-generic}
 	;;
+x86_64-*-darwin*)
+	with_arch=${with_arch:-nocona}
+	with_cpu=${with_cpu:-generic}
+	tmake_file="t-darwin ${cpu_type}/t-darwin64 t-slibgcc-darwin"
+	tm_file="${tm_file} ${cpu_type}/darwin64.h"
+	;;
 i[34567]86-*-elf*)
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h"
 	tmake_file="i386/t-i386elf t-svr4"
diff --git a/gcc/config.host b/gcc/config.host
index 4547864d9c1..4e3a017975d 100644
--- a/gcc/config.host
+++ b/gcc/config.host
@@ -177,7 +177,7 @@ case ${host} in
   i[34567]86-*-interix3*)
     host_xmake_file="${host_xmake_file} x-interix"
     ;;
-  i[34567]86-*-darwin*)
+  i[34567]86-*-darwin* | x86_64-*-darwin*)
     out_host_hook_obj="${out_host_hook_obj} host-i386-darwin.o"
     host_xmake_file="${host_xmake_file} i386/x-darwin"
     ;;
diff --git a/gcc/config/i386/darwin64.h b/gcc/config/i386/darwin64.h
new file mode 100644
index 00000000000..01686fa0ed5
--- /dev/null
+++ b/gcc/config/i386/darwin64.h
@@ -0,0 +1,35 @@
+/* Target definitions for x86_64 running Darwin.
+   Copyright (C) 2006 Free Software Foundation, Inc.
+   Contributed by Apple Computer Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING.  If not, write to
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#undef TARGET_VERSION
+#define TARGET_VERSION fprintf (stderr, " (x86_64 Darwin)");
+
+#undef  DARWIN_ARCH_SPEC
+#define DARWIN_ARCH_SPEC "%{m32:i386;:x86_64}"
+
+#undef  DARWIN_SUBARCH_SPEC
+#define DARWIN_SUBARCH_SPEC DARWIN_ARCH_SPEC
+
+#undef SUBTARGET_EXTRA_SPECS
+#define SUBTARGET_EXTRA_SPECS                                   \
+  { "darwin_arch", DARWIN_ARCH_SPEC },                          \
+  { "darwin_crt2", "" },                                        \
+  { "darwin_subarch", DARWIN_SUBARCH_SPEC },
diff --git a/gcc/config/i386/t-darwin64 b/gcc/config/i386/t-darwin64
new file mode 100644
index 00000000000..e7875864b18
--- /dev/null
+++ b/gcc/config/i386/t-darwin64
@@ -0,0 +1,3 @@
+SHLIB_VERPFX = $(srcdir)/config/i386/darwin-libgcc
+LIB2_SIDITI_CONV_FUNCS=yes
+LIB2FUNCS_EXTRA = $(srcdir)/config/darwin-64.c