diff -r 2bb0d54482e5 gcc/config/i386/i386-protos.h
--- a/gcc/config/i386/i386-protos.h	Fri Jul 09 12:46:32 2010 +0200
+++ b/gcc/config/i386/i386-protos.h	Fri Jul 09 12:51:21 2010 +0200
@@ -141,7 +141,7 @@
 extern bool ix86_function_arg_regno_p (int);
 extern void ix86_asm_output_function_label (FILE *, const char *, tree);
 extern int ix86_function_arg_boundary (enum machine_mode, tree);
-extern bool ix86_sol10_return_in_memory (const_tree,const_tree);
+extern bool ix86_solaris_return_in_memory (const_tree,const_tree);
 extern rtx ix86_force_to_memory (enum machine_mode, rtx);
 extern void ix86_free_from_memory (enum machine_mode);
 extern enum calling_abi ix86_cfun_abi (void);
diff -r 2bb0d54482e5 gcc/config/i386/i386.c
--- a/gcc/config/i386/i386.c	Fri Jul 09 12:46:32 2010 +0200
+++ b/gcc/config/i386/i386.c	Fri Jul 09 12:51:21 2010 +0200
@@ -6871,12 +6871,12 @@
 }
 
 /* Return false iff TYPE is returned in memory.  This version is used
-   on Solaris 10.  It is similar to the generic ix86_return_in_memory,
+   on Solaris 2.  It is similar to the generic ix86_return_in_memory,
    but differs notably in that when MMX is available, 8-byte vectors
    are returned in memory, rather than in MMX registers.  */
 
 bool
-ix86_sol10_return_in_memory (const_tree type, const_tree fntype ATTRIBUTE_UNUSED)
+ix86_solaris_return_in_memory (const_tree type, const_tree fntype ATTRIBUTE_UNUSED)
 {
   int size;
   enum machine_mode mode = type_natural_mode (type, NULL);
diff -r 2bb0d54482e5 gcc/config/i386/sol2-10.h
--- a/gcc/config/i386/sol2-10.h	Fri Jul 09 12:46:32 2010 +0200
+++ b/gcc/config/i386/sol2-10.h	Fri Jul 09 12:51:21 2010 +0200
@@ -145,7 +145,3 @@
 
 #undef TARGET_ASM_NAMED_SECTION
 #define TARGET_ASM_NAMED_SECTION i386_solaris_elf_named_section
-
-#undef SUBTARGET_RETURN_IN_MEMORY
-#define SUBTARGET_RETURN_IN_MEMORY(TYPE, FNTYPE) \
-	ix86_sol10_return_in_memory (TYPE, FNTYPE)
diff -r 2bb0d54482e5 gcc/config/i386/sol2.h
--- a/gcc/config/i386/sol2.h	Fri Jul 09 12:46:32 2010 +0200
+++ b/gcc/config/i386/sol2.h	Fri Jul 09 12:51:21 2010 +0200
@@ -140,6 +140,10 @@
 /* Register the Solaris-specific #pragma directives.  */
 #define REGISTER_SUBTARGET_PRAGMAS() solaris_register_pragmas ()
 
+#undef SUBTARGET_RETURN_IN_MEMORY
+#define SUBTARGET_RETURN_IN_MEMORY(TYPE, FNTYPE) \
+	ix86_solaris_return_in_memory (TYPE, FNTYPE)
+
 /* Output a simple call for .init/.fini.  */
 #define ASM_OUTPUT_CALL(FILE, FN)				\
   do								\
diff -r 2bb0d54482e5 gcc/config/i386/vx-common.h
--- a/gcc/config/i386/vx-common.h	Fri Jul 09 12:46:32 2010 +0200
+++ b/gcc/config/i386/vx-common.h	Fri Jul 09 12:51:21 2010 +0200
@@ -1,5 +1,5 @@
 /* IA32 VxWorks and VxWorks AE target definitions.
-   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008, 2010 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -20,7 +20,7 @@
 #define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \
   asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN)
 
-/* VxWorks uses the same ABI as Solaris 10.  */
+/* VxWorks uses the same ABI as Solaris 2.  */
 
 #define SUBTARGET_RETURN_IN_MEMORY(TYPE, FNTYPE) \
-	ix86_sol10_return_in_memory (TYPE, FNTYPE)
+	ix86_solaris_return_in_memory (TYPE, FNTYPE)