diff mbox

[COMMITTED] tile: separate ffsll from ffs

Message ID 201412212216.sBLMGmV3027942@farm-0002.internal.tilera.com
State Committed
Headers

Commit Message

Chris Metcalf Dec. 21, 2014, 9:11 p.m. UTC 
  This avoids a linknamespace failure when ffs is legal
but ffsll is not.
---
 ChangeLog            |    3 +++
 sysdeps/tile/ffs.c   |   11 +----------
 sysdeps/tile/ffsll.c |   33 ++++++++++++++++++++++++++++++++-
 3 files changed, 36 insertions(+), 11 deletions(-)
diff mbox

Patch

diff --git a/ChangeLog b/ChangeLog
index d21bd2b..d488679 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@ 
 2014-12-21  Chris Metcalf  <cmetcalf@ezchip.com>
 
+	* sysdeps/tile/ffs.c (__ffs): Moved ffsll definition...
+	* sysdeps/tile/ffsll.c (ffsll): To here.
+
 	* sysdeps/unix/sysv/linux/tile/localplt.data: Removed.
 
 2014-12-21  H.J. Lu  <hongjiu.lu@intel.com>
diff --git a/sysdeps/tile/ffs.c b/sysdeps/tile/ffs.c
index 3e52f8c..24241e3 100644
--- a/sysdeps/tile/ffs.c
+++ b/sysdeps/tile/ffs.c
@@ -30,16 +30,7 @@  weak_alias (__ffs, ffs)
 libc_hidden_def (__ffs)
 libc_hidden_builtin_def (ffs)
 
-#undef ffsll
-int
-ffsll (long long x)
-{
-  return __builtin_ffsll (x);
-}
-
-#undef ffsl
 #if ULONG_MAX == UINT_MAX
+#undef ffsl
 weak_alias (__ffs, ffsl)
-#else
-weak_alias (ffsll, ffsl)
 #endif
diff --git a/sysdeps/tile/ffsll.c b/sysdeps/tile/ffsll.c
index 180eaa8..04daf43 100644
--- a/sysdeps/tile/ffsll.c
+++ b/sysdeps/tile/ffsll.c
@@ -1 +1,32 @@ 
-/* This function is defined in ffs.c.  */
+/* Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <limits.h>
+#define ffsl __something_else
+#include <string.h>
+
+#undef ffsll
+int
+ffsll (long long x)
+{
+  return __builtin_ffsll (x);
+}
+
+#if ULONG_MAX > UINT_MAX
+#undef ffsl
+weak_alias (ffsll, ffsl)
+#endif