builtins.c (set_builtin_user_assembler_name): Also handle ffs if int is smaller than...

	* 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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9b8f4d5a969e8c805cde2705437b4cb6aa84fc10..f540be5212282dbe523b99c6647c0318199d21dc 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-10  Jakub Jelinek  <jakub@redhat.com>
+
+       * builtins.c (set_builtin_user_assembler_name): Also handle
+       ffs if int is smaller than word.
+
 2010-02-09  Vladimir Makarov  <vmakarov@redhat.com>
 
        PR middle-end/42973

diff --git a/gcc/builtins.c b/gcc/builtins.c
index b6fd1ead0fb9d28bbc318024da289bc164bd67ec..bfff2d54135191ee17b0d0cdd810e74a5687173f 100644 (file)
--- 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 9505d268f129b581dd41682e66001a3593e3838f..a2a3c8b8df686c116a5add61152f6a2e75cc49d4 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,4 +1,4 @@
-2010-02-09 Jerry DeLisle <jvdelisle@gcc.gnu.org>
+2010-02-09  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        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 7c00478f26a53e9bc270c088212e14d0184e8a99..59181d7c97c6417af8f4ba1e9a7fbafed024a37a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,4 +1,8 @@
-2010-02-09 Jerry DeLisle <jvdelisle@gcc.gnu.org>
+2010-02-10  Jakub Jelinek  <jakub@redhat.com>
+
+       * gcc.dg/builtin-ffs-1.c: New test.
+
+2010-02-09  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        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 (file)
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" } } */