diff -Nrcpad gcc-4.6.0/gcc/objc/ChangeLog gcc-4.6.1/gcc/objc/ChangeLog
*** gcc-4.6.0/gcc/objc/ChangeLog	Fri Mar 25 16:54:16 2011
--- gcc-4.6.1/gcc/objc/ChangeLog	Mon Jun 27 10:02:25 2011
***************
*** 1,3 ****
--- 1,16 ----
+ 2011-06-27  Release Manager
+ 
+ 	* GCC 4.6.1 released.
+ 
+ 2011-05-21  Nicola Pero  <nicola.pero@meta-innovation.com>
+ 
+ 	Backport from mainline
+ 	2011-05-21  Nicola Pero  <nicola.pero@meta-innovation.com>
+ 
+ 	* config-lang.in (gtfiles): Updated order of files to fix building
+ 	when the gcc/cp directory is missing, as in the case of some
+ 	release tarballs.
+ 
  2011-03-25  Release Manager
  
  	* GCC 4.6.0 released.
diff -Nrcpad gcc-4.6.0/gcc/objc/config-lang.in gcc-4.6.1/gcc/objc/config-lang.in
*** gcc-4.6.0/gcc/objc/config-lang.in	Fri Feb 18 00:07:38 2011
--- gcc-4.6.1/gcc/objc/config-lang.in	Sat May 21 16:53:19 2011
*************** target_libs=target-libobjc
*** 33,36 ****
  # Most of the object files for cc1obj actually come from C.
  lang_requires="c"
  
! gtfiles="\$(srcdir)/objc/objc-act.h \$(srcdir)/objc/objc-act.c \$(srcdir)/objc/objc-runtime-shared-support.c \$(srcdir)/objc/objc-gnu-runtime-abi-01.c \$(srcdir)/objc/objc-next-runtime-abi-01.c \$(srcdir)/objc/objc-next-runtime-abi-02.c \$(srcdir)/c-parser.c \$(srcdir)/c-tree.h \$(srcdir)/c-decl.c \$(srcdir)/c-lang.h \$(srcdir)/c-objc-common.c \$(srcdir)/c-family/c-common.c \$(srcdir)/c-family/c-common.h \$(srcdir)/c-family/c-objc.h \$(srcdir)/c-family/c-cppbuiltin.c \$(srcdir)/c-family/c-pragma.h \$(srcdir)/c-family/c-pragma.c"
--- 33,39 ----
  # Most of the object files for cc1obj actually come from C.
  lang_requires="c"
  
! # Order is important.  If you change this list, make sure you test
! # building without C++ as well; that is, remove the gcc/cp directory,
! # and build with --enable-languages=c,objc.
! gtfiles="\$(srcdir)/c-family/c-objc.h \$(srcdir)/objc/objc-act.h \$(srcdir)/objc/objc-act.c \$(srcdir)/objc/objc-runtime-shared-support.c \$(srcdir)/objc/objc-gnu-runtime-abi-01.c \$(srcdir)/objc/objc-next-runtime-abi-01.c \$(srcdir)/objc/objc-next-runtime-abi-02.c \$(srcdir)/c-parser.c \$(srcdir)/c-tree.h \$(srcdir)/c-decl.c \$(srcdir)/c-lang.h \$(srcdir)/c-objc-common.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"
diff -Nrcpad gcc-4.6.0/gcc/objcp/ChangeLog gcc-4.6.1/gcc/objcp/ChangeLog
*** gcc-4.6.0/gcc/objcp/ChangeLog	Fri Mar 25 16:54:06 2011
--- gcc-4.6.1/gcc/objcp/ChangeLog	Mon Jun 27 10:02:14 2011
***************
*** 1,3 ****
--- 1,7 ----
+ 2011-06-27  Release Manager
+ 
+ 	* GCC 4.6.1 released.
+ 
  2011-03-25  Release Manager
  
  	* GCC 4.6.0 released.
diff -Nrcpad gcc-4.6.0/libobjc/ChangeLog gcc-4.6.1/libobjc/ChangeLog
*** gcc-4.6.0/libobjc/ChangeLog	Fri Mar 25 16:55:29 2011
--- gcc-4.6.1/libobjc/ChangeLog	Mon Jun 27 10:03:38 2011
***************
*** 1,3 ****
--- 1,17 ----
+ 2011-06-27  Release Manager
+ 
+ 	* GCC 4.6.1 released.
+ 
+ 2011-05-25  Nicola Pero  <nicola.pero@meta-innovation.com>
+ 
+ 	Backport from mainline
+ 	2011-05-24  Nicola Pero  <nicola.pero@meta-innovation.com>
+ 
+ 	PR libobjc/48177
+ 	* selector.c (__sel_register_typed_name): Use sel_types_match()
+ 	instead of strcmp() to compare selector types (Suggestion by
+ 	Richard Frith-Macdonald <rfm@gnu.org>).
+ 
  2011-03-25  Release Manager
  
  	* GCC 4.6.0 released.
diff -Nrcpad gcc-4.6.0/libobjc/selector.c gcc-4.6.1/libobjc/selector.c
*** gcc-4.6.0/libobjc/selector.c	Mon Feb 28 14:48:23 2011
--- gcc-4.6.1/libobjc/selector.c	Wed May 25 09:07:57 2011
*************** __sel_register_typed_name (const char *n
*** 597,603 ****
  		    return s;
  		}
  	    }
! 	  else if (! strcmp (s->sel_types, types))
  	    {
  	      if (orig)
  		{
--- 597,603 ----
  		    return s;
  		}
  	    }
! 	  else if (sel_types_match (s->sel_types, types))
  	    {
  	      if (orig)
  		{