From 2fe83a0c9f923c21c75498982c2606beacc3f5d6 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Wed, 27 Jul 2011 17:33:50 +0200 Subject: i386.c (ix86_option_override_internal): Allow -mabi for 32-bit, too. * config/i386/i386.c (ix86_option_override_internal): Allow -mabi for 32-bit, too. (ix86_handle_abi_attribute): Allow function attributes ms_abi/sysv_abi in 32-bit mode, too. * doc/extend.texi: Adjust attribute documentation. * gcc.target/i386/aggregate-ret3.c: New test. * gcc.target/i386/aggregate-ret4.c: New test. From-SVN: r176828 --- gcc/ChangeLog | 6 ++++++ gcc/config/i386/i386.c | 10 --------- gcc/doc/extend.texi | 19 +++++++++-------- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.target/i386/aggregate-ret3.c | 28 ++++++++++++++++++++++++++ gcc/testsuite/gcc.target/i386/aggregate-ret4.c | 28 ++++++++++++++++++++++++++ 6 files changed, 78 insertions(+), 18 deletions(-) create mode 100644 gcc/testsuite/gcc.target/i386/aggregate-ret3.c create mode 100644 gcc/testsuite/gcc.target/i386/aggregate-ret4.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 996bb93..229473a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2011-07-27 Kai Tietz + * config/i386/i386.c (ix86_option_override_internal): Allow -mabi + for 32-bit, too. + (ix86_handle_abi_attribute): Allow function attributes + ms_abi/sysv_abi in 32-bit mode, too. + * doc/extend.texi: Adjust attribute documentation. + * gimple-fold.c (or_comparisons_1): Remove TRUTH_AND/OR expression handling. (and_var_with_comparison_1): Likewise. diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 960622a..81c53cb 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -3133,9 +3133,6 @@ ix86_option_override_internal (bool main_args_p) if (!global_options_set.x_ix86_abi) ix86_abi = DEFAULT_ABI; - if (ix86_abi == MS_ABI && TARGET_X32) - error ("MS ABI not supported in x32 mode"); - if (global_options_set.x_ix86_cmodel) { switch (ix86_cmodel) @@ -29325,13 +29322,6 @@ ix86_handle_abi_attribute (tree *node, tree name, *no_add_attrs = true; return NULL_TREE; } - if (!TARGET_LP64) - { - warning (OPT_Wattributes, "%qE attribute only available for 64-bit", - name); - *no_add_attrs = true; - return NULL_TREE; - } /* Can combine regparm with all attributes but fastcall. */ if (is_attribute_p ("ms_abi", name)) diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi index dcbf29f..0c95a79 100644 --- a/gcc/doc/extend.texi +++ b/gcc/doc/extend.texi @@ -2819,15 +2819,15 @@ defined by shared libraries. @cindex @code{ms_abi} attribute @cindex @code{sysv_abi} attribute -On 64-bit x86_64-*-* targets, you can use an ABI attribute to indicate -which calling convention should be used for a function. The @code{ms_abi} -attribute tells the compiler to use the Microsoft ABI, while the -@code{sysv_abi} attribute tells the compiler to use the ABI used on -GNU/Linux and other systems. The default is to use the Microsoft ABI -when targeting Windows. On all other systems, the default is the AMD ABI. +On 32-bit and 64-bit (i?86|x86_64)-*-* targets, you can use an ABI attribute +to indicate which calling convention should be used for a function. The +@code{ms_abi} attribute tells the compiler to use the Microsoft ABI, +while the @code{sysv_abi} attribute tells the compiler to use the ABI +used on GNU/Linux and other systems. The default is to use the Microsoft ABI +when targeting Windows. On all other systems, the default is the x86/AMD ABI. -Note, the @code{ms_abi} attribute for Windows targets currently requires -the @option{-maccumulate-outgoing-args} option. +Note, the @code{ms_abi} attribute for Windows 64-bit targets currently +requires the @option{-maccumulate-outgoing-args} option. @item callee_pop_aggregate_return (@var{number}) @cindex @code{callee_pop_aggregate_return} attribute @@ -2839,6 +2839,9 @@ zero -, or if the callee is responsible to pop hidden pointer - @var{number} equal to one. The default i386 ABI assumes that the callee pops the stack for hidden pointer. +Note, that on 32-bit i386 Windows targets the compiler assumes that the +caller pops the stack for hidden pointer. + @item ms_hook_prologue @cindex @code{ms_hook_prologue} attribute diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a1df3d1..a90a639 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-07-27 Kai Tietz + + * gcc.target/i386/aggregate-ret3.c: New test. + * gcc.target/i386/aggregate-ret4.c: New test. + 2011-07-27 Daniel Carrera PR fortran/49755 diff --git a/gcc/testsuite/gcc.target/i386/aggregate-ret3.c b/gcc/testsuite/gcc.target/i386/aggregate-ret3.c new file mode 100644 index 0000000..e3c5b09 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/aggregate-ret3.c @@ -0,0 +1,28 @@ +/* Check that, with keep_aggregate_return_pointer attribute, callee does + not pop the stack for the implicit pointer arg when returning a large + structure in memory. */ +/* { dg-do compile } */ +/* { dg-require-effective-target ia32 } */ + +struct foo { + int a; + int b; + int c; + int d; +}; + +__attribute__ ((ms_abi)) +struct foo +bar (void) +{ + struct foo retval; + retval.a = 1; + retval.b = 2; + retval.c = 3; + retval.d = 4; + return retval; +} + +/* { dg-final { scan-assembler-not "ret\[ \t\]\\\$4" } } */ + + diff --git a/gcc/testsuite/gcc.target/i386/aggregate-ret4.c b/gcc/testsuite/gcc.target/i386/aggregate-ret4.c new file mode 100644 index 0000000..6e70f49 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/aggregate-ret4.c @@ -0,0 +1,28 @@ +/* Check that, with dont_keep_aggregate_return_pointer attribute, callee + pops the stack for the implicit pointer arg when returning a large + structure in memory. */ +/* { dg-do compile } */ +/* { dg-require-effective-target ia32 } */ + +struct foo { + int a; + int b; + int c; + int d; +}; + +__attribute__ ((sysv_abi)) +struct foo +bar (void) +{ + struct foo retval; + retval.a = 1; + retval.b = 2; + retval.c = 3; + retval.d = 4; + return retval; +} + +/* { dg-final { scan-assembler "ret\[ \t\]\\\$4" } } */ + + -- cgit v1.1