From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 14 Jun 2003 05:18:31 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_3_3~595
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da4fef4bc3403c7d6f481ec35d7153328e222f9b;p=thirdparty%2Fglibc.git

Update.

	* sysdeps/unix/sysv/linux/sys/param.h (howmany): Optimize for gcc.
---

diff --git a/ChangeLog b/ChangeLog
index fe1a1396741..c81fabeb520 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-06-13  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/unix/sysv/linux/sys/param.h (howmany): Optimize for gcc.
+
 	Fixing gcc 3.3 warnings, part II.
 	* argp/argp-help.c (hol_entry_long_iterate): Always inline.
 	* elf/dl-load.c (cache_rpath): Don't inline.
diff --git a/sysdeps/unix/sysv/linux/sys/param.h b/sysdeps/unix/sysv/linux/sys/param.h
index d64f4b9a98a..0b0424eb90f 100644
--- a/sysdeps/unix/sysv/linux/sys/param.h
+++ b/sysdeps/unix/sysv/linux/sys/param.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,2000,2001,2003 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
@@ -49,10 +49,16 @@
 
 /* Macros for counting and rounding.  */
 #ifndef howmany
-# define howmany(x, y)	(((x)+((y)-1))/(y))
+# define howmany(x, y)	(((x) + ((y) - 1)) / (y))
 #endif
-#define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))
-#define powerof2(x)	((((x)-1)&(x))==0)
+#ifdef __GNUC__
+# define roundup(x, y)	(__builtin_constant_p (y) && powerof2 (y)	      \
+			 ? (((x) + (y) - 1) & ~((y) - 1))		      \
+			 : ((((x) + ((y) - 1)) / (y)) * (y)))
+#else
+# define roundup(x, y)	((((x) + ((y) - 1)) / (y)) * (y))
+#endif
+#define powerof2(x)	((((x) - 1) & (x)) == 0)
 
 /* Macros for min/max.  */
 #define	MIN(a,b) (((a)<(b))?(a):(b))