summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog15
-rw-r--r--Makerules2
-rw-r--r--stdio/_itoa.h12
3 files changed, 24 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 270a235570..04b53e88ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Sun Apr  9 01:24:33 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* Makerules (+depfiles): Translate %.so to %.o in $(extra-objs).
+
+	* malloc/free.c [emacs] (__malloc_safe_bcopy): Define to safe_bcopy.
+	* malloc/realloc.c (__malloc_safe_bcopy): Undefine before defining.
+
+	* malloc/free.c (memmove, __malloc_safe_bcopy): Do include these
+ 	#ifdef emacs, but only #ifndef memmove.
+	* malloc/realloc.c [emacs] (__malloc_safe_bcopy): Just #define to
+ 	safe_bcopy.
+	(memmove): Define only if undefined.
+
 Sat Apr  8 00:40:59 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
 	* extra-lib.mk (install-lib, extra-objs, alltypes-$(lib)): Make
@@ -21,6 +34,8 @@ Sat Apr  8 00:40:59 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
  	#ifdef emacs.
 	* malloc/realloc.c: Likewise.
 
+	* stdio/_itoa.h (_EXTERN_INLINE): Define if undefined.
+	(_itoa): Use it in defn.
 	* stdio/_itoa.c (_EXTERN_INLINE): Define to empty before #include
  	"_itoa.h".
 	(_itoa): Function removed.
diff --git a/Makerules b/Makerules
index 55e7520c64..b155c5551f 100644
--- a/Makerules
+++ b/Makerules
@@ -281,7 +281,7 @@ include $(patsubst %,$(..)extra-lib.mk,$(extra-libs))
 endif
 
 +depfiles := $(strip $(sources:.c=.d) \
-		     $(patsubst %.o,%.d,$(filter %.o,$(extra-objs))) \
+		     $(patsubst %.o,%.d,$(filter %.o,$(extra-objs:.so=.o))) \
 		     $(addsuffix .d,$(others) $(tests)))
 +depfiles := $(addprefix $(objpfx),\
 			 $(filter-out $(addsuffix .d,$(omit-deps)),\
diff --git a/stdio/_itoa.h b/stdio/_itoa.h
index 791ce6c87f..81240507b1 100644
--- a/stdio/_itoa.h
+++ b/stdio/_itoa.h
@@ -1,5 +1,5 @@
 /* Internal function for converting integers to ASCII.
-Copyright (C) 1994 Free Software Foundation, Inc.
+Copyright (C) 1994, 1995 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
@@ -31,8 +31,12 @@ extern const char _itoa_lower_digits[], _itoa_upper_digits[];
 extern char *_itoa __P ((unsigned long long int value, char *buflim,
 			 unsigned int base, int upper_case));
 
-#if defined (__GNUC__) && defined (__OPTIMIZE__)
-extern __inline char *
+#ifndef _EXTERN_INLINE
+#define _EXTERN_INLINE extern __inline 
+#endif
+
+_EXTERN_INLINE
+char *
 _itoa (unsigned long long int value, char *buflim,
        unsigned int base, int upper_case)
 {
@@ -49,6 +53,6 @@ _itoa (unsigned long long int value, char *buflim,
 
   return bp;
 }
-#endif
+
 
 #endif	/* itoa.h */