From cbb1ab104083d2fda4b7eee3b8c1a383ff5ced4e Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 10 Feb 2010 10:21:12 +0100 Subject: [PATCH] builtins.c (set_builtin_user_assembler_name): Also handle ffs if int is smaller than word. * builtins.c (set_builtin_user_assembler_name): Also handle ffs if int is smaller than word. * gcc.dg/builtin-ffs-1.c: New test. From-SVN: r156646 --- gcc/ChangeLog | 5 +++++ gcc/builtins.c | 8 ++++++++ gcc/fortran/ChangeLog | 2 +- gcc/testsuite/ChangeLog | 6 +++++- gcc/testsuite/gcc.dg/builtin-ffs-1.c | 17 +++++++++++++++++ 5 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/builtin-ffs-1.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9b8f4d5..f540be5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2010-02-10 Jakub Jelinek + + * builtins.c (set_builtin_user_assembler_name): Also handle + ffs if int is smaller than word. + 2010-02-09 Vladimir Makarov PR middle-end/42973 diff --git a/gcc/builtins.c b/gcc/builtins.c index b6fd1ea..bfff2d5 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -13594,6 +13594,14 @@ set_builtin_user_assembler_name (tree decl, const char *asmspec) case BUILT_IN_ABORT: abort_libfunc = set_user_assembler_libfunc ("abort", asmspec); break; + case BUILT_IN_FFS: + if (INT_TYPE_SIZE < BITS_PER_WORD) + { + set_user_assembler_libfunc ("ffs", asmspec); + set_optab_libfunc (ffs_optab, mode_for_size (INT_TYPE_SIZE, + MODE_INT, 0), "ffs"); + } + break; default: break; } diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 9505d26..a2a3c8b 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,4 +1,4 @@ -2010-02-09 Jerry DeLisle +2010-02-09 Jerry DeLisle PR fortran/42999 * array.c (gfc_constant_ac): Do not prevent expansion of constructors diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7c00478..59181d7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,4 +1,8 @@ -2010-02-09 Jerry DeLisle +2010-02-10 Jakub Jelinek + + * gcc.dg/builtin-ffs-1.c: New test. + +2010-02-09 Jerry DeLisle PR fortran/42999 * gfortran.dg/array_constructor_35.f90: New test. diff --git a/gcc/testsuite/gcc.dg/builtin-ffs-1.c b/gcc/testsuite/gcc.dg/builtin-ffs-1.c new file mode 100644 index 0000000..2bf0e98 --- /dev/null +++ b/gcc/testsuite/gcc.dg/builtin-ffs-1.c @@ -0,0 +1,17 @@ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +extern int ffs (int) __asm ("__GI_ffs") __attribute__ ((nothrow, const)); + +int +ffsll (long long int i) +{ + unsigned long long int x = i & -i; + + if (x <= 0xffffffff) + return ffs (i); + else + return 32 + ffs (i >> 32); +} + +/* { dg-final { scan-assembler-not "\nffs\n|\nffs\[^a-zA-Z0-9_\]|\[^a-zA-Z0-9_\]ffs\n" } } */ -- 2.7.4