This is the mail archive of the libc-alpha@sources.redhat.com mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[patch] don't give bodies for both 'extern inline' and normal versionsof a function in same file


In olden days, atof.c needed to #undef the macro version.
Similarly, with gcc-3.5, atof.c needs to avoid defining the 'extern inline'
version, else gcc complains "hey, you asked for both 'always inline'
and 'never inline', please figure out what you want" and aborts.
Here's a tiny patch that gets past that problem.  I tested it just to
make sure the changed files now build on i686.  Although the
diff is against glibc-2.3.2, it should apply to CVS, too.


2004-07-18 Dan Kegel <dank@kegel.com>


	* stdlib/abs.c, stdlib/atoi{i,f,l,ll}.c: don't define both
          'extern inline' and normal versions of a function in same file


--- glibc-2.3.2/stdlib/abs.c.old 2004-07-18 12:08:43.000000000 -0700 +++ glibc-2.3.2/stdlib/abs.c 2004-07-18 12:09:18.000000000 -0700 @@ -16,6 +16,8 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */

+#define __NO_INLINE__ 1        /* avoid http://gcc.gnu.org/PR14096 */
+
 #include <stdlib.h>

 #undef abs
--- glibc-2.3.2/stdlib/atoi.c.old       2004-07-18 12:08:17.000000000 -0700
+++ glibc-2.3.2/stdlib/atoi.c   2004-07-18 12:08:27.000000000 -0700
@@ -16,6 +16,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */

+#define __NO_INLINE__ 1        /* avoid http://gcc.gnu.org/PR14096 */
+
 #include <stdlib.h>

 #undef atoi
--- glibc-2.3.2/stdlib/atof.c.old       2004-07-18 12:06:09.000000000 -0700
+++ glibc-2.3.2/stdlib/atof.c   2004-07-18 12:05:31.000000000 -0700
@@ -16,6 +16,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */

+#define __NO_INLINE__ 1        /* avoid http://gcc.gnu.org/PR14096 */
+
 #include <stdlib.h>

 #undef atof
--- glibc-2.3.2/stdlib/atol.c.old       2004-07-18 12:08:49.000000000 -0700
+++ glibc-2.3.2/stdlib/atol.c   2004-07-18 12:09:40.000000000 -0700
@@ -16,6 +16,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */

+#define __NO_INLINE__ 1        /* avoid http://gcc.gnu.org/PR14096 */
+
 #include <stdlib.h>

 #undef atol
--- glibc-2.3.2/stdlib/atoll.c.old      2004-07-18 12:08:55.000000000 -0700
+++ glibc-2.3.2/stdlib/atoll.c  2004-07-18 12:09:59.000000000 -0700
@@ -16,6 +16,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */

+#define __NO_INLINE__ 1        /* avoid http://gcc.gnu.org/PR14096 */
+
 #include <stdlib.h>

#undef atoll

--
My technical stuff: http://kegel.com
My politics: see http://www.misleader.org for examples of why I'm for regime change


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]