backport: i386.c (ix86_sol10_return_in_memory): Rename to ix86_solaris_return_in_memory.

Backport from mainline:
	2010-07-12  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	* config/i386/i386.c (ix86_sol10_return_in_memory): Rename to
	ix86_solaris_return_in_memory.
	* config/i386-protos.h: Reflect this.
	* config/i386/vx-common.h (SUBTARGET_RETURN_IN_MEMORY): Likewise.
	* config/i386/sol2-10.h (SUBTARGET_RETURN_IN_MEMORY): Likewise.
	Move ...
	* config/i386/sol2.h (SUBTARGET_RETURN_IN_MEMORY): ... here.

From-SVN: r162213
This commit is contained in:
Rainer Orth 2010-07-15 10:08:56 +00:00 committed by Rainer Orth
parent 75bf9027a2
commit fa18a5767c
6 changed files with 23 additions and 10 deletions

View File

@ -1,3 +1,16 @@
2010-07-15 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Backport from mainline:
2010-07-12 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* config/i386/i386.c (ix86_sol10_return_in_memory): Rename to
ix86_solaris_return_in_memory.
* config/i386-protos.h: Reflect this.
* config/i386/vx-common.h (SUBTARGET_RETURN_IN_MEMORY): Likewise.
* config/i386/sol2-10.h (SUBTARGET_RETURN_IN_MEMORY): Likewise.
Move ...
* config/i386/sol2.h (SUBTARGET_RETURN_IN_MEMORY): ... here.
2010-07-15 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Backport from mainline:

View File

@ -137,7 +137,7 @@ extern rtx ix86_libcall_value (enum machine_mode);
extern bool ix86_function_value_regno_p (int);
extern bool ix86_function_arg_regno_p (int);
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 int ix86_cfun_abi (void);

View File

@ -6362,12 +6362,12 @@ ix86_return_in_memory (const_tree type, const_tree fntype ATTRIBUTE_UNUSED)
}
/* 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);

View File

@ -129,7 +129,3 @@ along with GCC; see the file COPYING3. If not see
#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)

View File

@ -103,6 +103,10 @@ along with GCC; see the file COPYING3. If not see
/* 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 \

View File

@ -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 @@ along with GCC; see the file COPYING3. If not see
#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)