Index: gcc/config.gcc
===================================================================
--- gcc/config.gcc	(revision 165662)
+++ gcc/config.gcc	(working copy)
@@ -147,6 +147,10 @@
 #
 #  target_gtfiles       List of extra source files with type information.
 #
+#  target_cfamily_gtfiles
+#			List of extra source files with type information
+#			to be used for c family only.
+#
 #  xm_defines		List of macros to define when compiling for the
 #			target machine.
 #
@@ -217,6 +221,7 @@ gnu_ld="$gnu_ld_flag"
 default_use_cxa_atexit=no
 default_gnu_indirect_function=no
 target_gtfiles=
+target_cfamily_gtfiles=
 need_64bit_hwint=
 need_64bit_isa=
 # Selects the object file format reader/writer used by LTO.
@@ -464,9 +469,10 @@ case ${target} in
   tm_file="${tm_file} ${cpu_type}/darwin.h"
   tm_p_file="${tm_p_file} darwin-protos.h"
   target_gtfiles="\$(srcdir)/config/darwin.c"
+  target_cfamily_gtfiles="\$(srcdir)/config/darwin-cfstrings.c"
   extra_options="${extra_options} darwin.opt"
-  c_target_objs="${c_target_objs} darwin-c.o"
-  cxx_target_objs="${cxx_target_objs} darwin-c.o"
+  c_target_objs="${c_target_objs} darwin-c.o darwin-cfstrings.o"
+  cxx_target_objs="${cxx_target_objs} darwin-c.o darwin-cfstrings.o"
   fortran_target_objs="darwin-f.o"
   extra_objs="darwin.o"
   extra_gcc_objs="darwin-driver.o"
Index: gcc/c-config-lang.in
===================================================================
--- gcc/c-config-lang.in	(revision 165662)
+++ gcc/c-config-lang.in	(working copy)
@@ -1,5 +1,6 @@
 # Top level configure fragment for GNU C - C language.
-# Copyright (C) 1994, 1995, 1997, 1998, 2000, 2001, 2002, 2005, 2007 Free Software Foundation, Inc.
+#   Copyright (C) 1994, 1995, 1997, 1998, 2000, 2001, 2002, 2005, 2007, 2010
+#   Free Software Foundation, Inc.
 
 #This file is part of GCC.
 
@@ -23,3 +24,4 @@
 # which therefore need to be scanned by gengtype.c.
 
 gtfiles="\$(srcdir)/c-lang.c \$(srcdir)/c-tree.h \$(srcdir)/c-decl.c \$(srcdir)/c-family/c-common.c \$(srcdir)/c-family/c-common.h \$(srcdir)/c-family/c-cppbuiltin.c \$(srcdir)/c-family/c-pragma.h \$(srcdir)/c-family/c-pragma.c \$(srcdir)/c-objc-common.c \$(srcdir)/c-parser.c \$(srcdir)/c-lang.h"
+gtfiles="${gtfiles} ${target_cfamily_gtfiles}"
Index: gcc/cp/config-lang.in
===================================================================
--- gcc/cp/config-lang.in	(revision 165662)
+++ gcc/cp/config-lang.in	(working copy)
@@ -1,5 +1,5 @@
 # Top level configure fragment for GNU C++.
-#   Copyright (C) 1994, 1995, 1997, 1998, 2000, 2001, 2002, 2007
+#   Copyright (C) 1994, 1995, 1997, 1998, 2000, 2001, 2002, 2007, 2010
 #   Free Software Foundation, Inc.
 
 #This file is part of GCC.
@@ -31,3 +31,4 @@ compilers="cc1plus\$(exeext)"
 target_libs="target-libstdc++-v3"
 
 gtfiles="\$(srcdir)/cp/rtti.c \$(srcdir)/cp/mangle.c \$(srcdir)/cp/name-lookup.h \$(srcdir)/cp/name-lookup.c \$(srcdir)/cp/cp-tree.h \$(srcdir)/cp/decl.h \$(srcdir)/cp/call.c \$(srcdir)/cp/decl.c \$(srcdir)/cp/decl2.c \$(srcdir)/cp/pt.c \$(srcdir)/cp/repo.c \$(srcdir)/cp/semantics.c \$(srcdir)/cp/tree.c \$(srcdir)/cp/parser.c \$(srcdir)/cp/method.c \$(srcdir)/cp/typeck2.c \$(srcdir)/c-family/c-common.c \$(srcdir)/c-family/c-common.h \$(srcdir)/c-family/c-lex.c \$(srcdir)/c-family/c-pragma.h \$(srcdir)/c-family/c-pragma.c \$(srcdir)/cp/class.c \$(srcdir)/cp/cp-objcp-common.c \$(srcdir)/cp/cp-lang.c"
+gtfiles="${gtfiles} ${target_cfamily_gtfiles}"
Index: gcc/objc/config-lang.in
===================================================================
--- gcc/objc/config-lang.in	(revision 165662)
+++ gcc/objc/config-lang.in	(working copy)
@@ -1,5 +1,5 @@
 # Top level configure fragment for GNU Objective-C
-#   Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2007
+#   Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2010
 #   Free Software Foundation, Inc.
 
 #This file is part of GCC.
@@ -34,3 +34,4 @@ target_libs=target-libobjc
 lang_requires="c"
 
 gtfiles="\$(srcdir)/objc/objc-act.h \$(srcdir)/c-parser.c \$(srcdir)/c-tree.h \$(srcdir)/c-decl.c \$(srcdir)/c-objc-common.c \$(srcdir)/c-family/c-common.c \$(srcdir)/c-family/c-common.h \$(srcdir)/c-family/c-pragma.h \$(srcdir)/c-family/c-pragma.c \$(srcdir)/objc/objc-act.c"
+gtfiles="${gtfiles} ${target_cfamily_gtfiles}"
Index: gcc/objcp/config-lang.in
===================================================================
--- gcc/objcp/config-lang.in	(revision 165662)
+++ gcc/objcp/config-lang.in	(working copy)
@@ -1,5 +1,5 @@
 # Top level configure fragment for GNU Objective-C++.
-#   Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#   Copyright (C) 2005, 2007, 2010 Free Software Foundation, Inc.
 #   Contributed by Ziemowit Laski <zlaski@apple.com>
 
 #This file is part of GCC.
@@ -38,3 +38,4 @@ lang_requires="objc c++"
 subdir_requires="objc cp"
 
 gtfiles="\$(srcdir)/objcp/objcp-decl.c \$(srcdir)/objc/objc-act.c \$(srcdir)/objc/objc-act.h \$(srcdir)/cp/rtti.c \$(srcdir)/cp/mangle.c \$(srcdir)/cp/name-lookup.h \$(srcdir)/cp/name-lookup.c \$(srcdir)/cp/cp-tree.h \$(srcdir)/cp/decl.h \$(srcdir)/cp/call.c \$(srcdir)/cp/decl.c \$(srcdir)/cp/decl2.c \$(srcdir)/cp/pt.c \$(srcdir)/cp/repo.c \$(srcdir)/cp/semantics.c \$(srcdir)/cp/tree.c \$(srcdir)/cp/parser.c \$(srcdir)/cp/method.c \$(srcdir)/cp/typeck2.c \$(srcdir)/c-family/c-common.c \$(srcdir)/c-family/c-common.h \$(srcdir)/c-family/c-lex.c \$(srcdir)/c-family/c-pragma.h \$(srcdir)/c-family/c-pragma.c \$(srcdir)/cp/cp-objcp-common.c"
+gtfiles="${gtfiles} ${target_cfamily_gtfiles}"
