* scripts/gen-as-const.awk: Generate more widely usable code by

	using 64-bit arithmetic.

ChangeLog

@@ -1,5 +1,8 @@
 2008-07-26  Ulrich Drepper  <drepper@redhat.com>
 
+	* scripts/gen-as-const.awk: Generate more widely usable code by
+	using 64-bit arithmetic.
+
 	* stdio-common/printf_fp.c (___printf_fp): Give wide outout code
 	the same treatment as narow output code in last patch.
 

nptl/ChangeLog

@@ -1,3 +1,9 @@
+2008-04-28  Hiroki Kaminaga  <kaminaga@sm.sony.co.jp>
+
+	[BZ #6740]
+	* sysdeps/powerpc/tcb-offsets.sym (PRIVATE_FUTEX_OFFSET): Guard symbol
+	definition with #ifndef __ASSUME_PRIVATE_FUTEX.
+
 2008-07-25  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/mq_notify.c (init_mq_netlink): Use

scripts/gen-as-const.awk

@@ -14,12 +14,14 @@ BEGIN { started = 0 }
 
 NF >= 1 && !started {
   if (test) {
+    print "\n#include <inttypes.h>";
     print "\n#include <stdio.h>";
+    print "\n#define U(n) UINT64_C (n)";
     print "\nstatic int do_test (void)\n{\n  int bad = 0, good = 0;\n";
     print "#define TEST(name, source, expr) \\\n" \
-      "  if (asconst_##name != (expr)) { ++bad;" \
-      " fprintf (stderr, \"%s: %s is %ld but %s is %ld\\n\"," \
-      " source, #name, (long int) asconst_##name, #expr, (long int) (expr));" \
+      "  if (U (asconst_##name) != (uint64_t) (expr)) { ++bad;" \
+      " fprintf (stderr, \"%s: %s is %\" PRId64 \" but %s is %\"PRId64 \"\\n\"," \
+      " source, #name, U (asconst_##name), #expr, (uint64_t) (expr));" \
       " } else ++good;\n";
   }
   else