From ae9b308c6a4a6c2dc6886723764616f85402480d Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 7 May 1998 13:10:33 +0000
Subject: [PATCH] Update.

1997-05-07 13:26  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* Makerules (lib): Put back dependency on lib-noranlib.
	($(subdirs-stamps)): Remove dependency on stamp.* again.

1998-05-07  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/i386/fpu/bits/mathinline.h: Use long long int also for
	test in __pow2 implementation.

1998-05-07  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* malloc/malloc.c (top_check): Add void as parameter to silent gcc.
---
 ChangeLog                          | 14 ++++++++++++++
 Makerules                          |  5 ++---
 malloc/malloc.c                    |  5 +++++
 sysdeps/i386/fpu/bits/mathinline.h |  2 +-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 803811de6c..1776d883c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,23 @@
+1997-05-07 13:26  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* Makerules (lib): Put back dependency on lib-noranlib.
+	($(subdirs-stamps)): Remove dependency on stamp.* again.
+
+1998-05-07  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sysdeps/i386/fpu/bits/mathinline.h: Use long long int also for
+	test in __pow2 implementation.
+
 1998-04-16 07:42  Geoff Keating  <geoffk@ozemail.com.au>
 
 	* Makeconfig [!build-static]: Link `static' binaries with libc_pic.a.
 	Still need *FLAGS-.o because we still sometimes build .o files.
 	* db2/Makefile: Don't build libndbm.a if !build-static.
 
+1998-05-07  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* malloc/malloc.c (top_check): Add void as parameter to silent gcc.
+
 1998-04-16 07:42  Geoff Keating  <geoffk@ozemail.com.au>
 
 	* configure.in: New test for broken gcc on PowerPC.
diff --git a/Makerules b/Makerules
index ff89ffe817..8be73d0235 100644
--- a/Makerules
+++ b/Makerules
@@ -491,7 +491,7 @@ CREATE_ARFLAGS := cru$(verbose)
 # This makes all the object files in the parent library archive.
 
 .PHONY: lib lib-noranlib
-lib: $(foreach l,$(libtypes),$(patsubst %,$(common-objpfx)$l,c))
+lib: lib-noranlib $(foreach l,$(libtypes),$(patsubst %,$(common-objpfx)$l,c))
 lib-noranlib: libobjs
 
 # For object-suffix $o, the list of objects with that suffix.
@@ -543,8 +543,7 @@ endef
 subdirs-stamps := $(foreach d,$(subdirs),$(common-objpfx)$d/stamp%)
 subdirs-stamp-o = $(subst %,$o,$(subdirs-stamps))
 ifndef subdir
-$(subdirs-stamps): $(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$o) \
-		   subdir_lib;
+$(subdirs-stamps): subdir_lib;
 endif
 object-suffixes-left = $(object-suffixes-for-libc)
 include $(o-iterator)
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 03bc5569b9..607961a9c6 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4246,8 +4246,13 @@ mem2chunk_check(mem) Void_t* mem;
 /* Check for corruption of the top chunk, and try to recover if
    necessary. */
 
+static int
+#if __STD_C
+top_check(void)
+#else
 static int
 top_check()
+#endif
 {
   mchunkptr t = top(&main_arena);
   char* brk, * new_brk;
diff --git a/sysdeps/i386/fpu/bits/mathinline.h b/sysdeps/i386/fpu/bits/mathinline.h
index e78c76986b..6aea2cb4da 100644
--- a/sysdeps/i386/fpu/bits/mathinline.h
+++ b/sysdeps/i386/fpu/bits/mathinline.h
@@ -231,7 +231,7 @@ __inline_mathcode (__sgn, __x, \
 __inline_mathcode (__pow2, __x, \
   register long double __value;						      \
   register long double __exponent;					      \
-  long int __p = (long int) __x;					      \
+  long long int __p = (long long int) __x;				      \
   if (__x == (long double) __p)						      \
     {									      \
       __asm __volatile__						      \
-- 
2.43.5