This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: Patch for more libiberty cleanups
> From: DJ Delorie <dj at redhat dot com>
>
> > Shouldn't need to. I'll check the generator program.
>
> Fixed. It just didn't expect .h files in $srcdir.
>
> 2003-04-15 DJ Delorie <dj at redhat dot com>
>
> * maint-tool (deps): Scan for headers in $srcdir also.
>
Thanks.
And here's the updated version of my patch. Ok?
2003-04-15 Kaveh R. Ghazi <ghazi at caip dot rutgers dot edu>
* argv.c: Fix comments.
* calloc.c: Don't unnecessarily include "libiberty.h".
(bzero): Add prototype.
* floatformat.c: Include "ansidecl.h", rely on ANSI_PROTOTYPES.
* getcwd.c (getcwd): Use standard definition to avoid conflicts
with system headers.
* hashtab.c (htab_traverse): Delete unused variables.
* rename.c: Include "ansidecl.h".
(rename): Use standard definition to avoid conflicts with system
headers.
* strsignal.c: Rely on ANSI_PROTOTYPES.
* strstr.c: Check GNUC >= 2, not GNUC == 2.
* vfprintf.c: Include "ansidecl.h", rely on ANSI_PROTOTYPES.
* vprintf.c: Include "ansidecl.h" earlier, rely on
ANSI_PROTOTYPES.
* vsprintf.c: Include "ansidecl.h" earlier, rely on
ANSI_PROTOTYPES and possibly include <stdarg.h>.
* Makefile.in: Regenerate dependencies.
diff -rup orig/egcc-CVS20030415/libiberty/argv.c egcc-CVS20030415/libiberty/argv.c
--- orig/egcc-CVS20030415/libiberty/argv.c 2003-04-15 10:13:25.000000000 -0400
+++ egcc-CVS20030415/libiberty/argv.c 2003-04-15 16:06:47.575607000 -0400
@@ -35,7 +35,7 @@ Boston, MA 02111-1307, USA. */
#include <string.h>
#include <stdlib.h>
-#else /* !__STDC__ */
+#else /* !ANSI_PROTOTYPES */
#if !defined _WIN32 || defined __GNUC__
extern char *memcpy (); /* Copy memory region */
@@ -46,7 +46,7 @@ extern void free (); /* Free malloc'd m
extern char *strdup (); /* Duplicate a string */
#endif
-#endif /* __STDC__ */
+#endif /* ANSI_PROTOTYPES */
#ifndef NULL
diff -rup orig/egcc-CVS20030415/libiberty/calloc.c egcc-CVS20030415/libiberty/calloc.c
--- orig/egcc-CVS20030415/libiberty/calloc.c 2001-09-26 14:16:17.000000000 -0400
+++ egcc-CVS20030415/libiberty/calloc.c 2003-04-15 16:06:47.575655000 -0400
@@ -13,8 +13,6 @@ Uses @code{malloc} to allocate storage f
*/
#include "ansidecl.h"
-#include "libiberty.h"
-
#ifdef ANSI_PROTOTYPES
#include <stddef.h>
#else
@@ -23,6 +21,7 @@ Uses @code{malloc} to allocate storage f
/* For systems with larger pointers than ints, this must be declared. */
PTR malloc PARAMS ((size_t));
+void bzero PARAMS ((PTR, size_t));
PTR
calloc (nelem, elsize)
diff -rup orig/egcc-CVS20030415/libiberty/floatformat.c egcc-CVS20030415/libiberty/floatformat.c
--- orig/egcc-CVS20030415/libiberty/floatformat.c 2002-03-06 01:29:00.000000000 -0500
+++ egcc-CVS20030415/libiberty/floatformat.c 2003-04-15 16:06:47.585619000 -0400
@@ -17,9 +17,10 @@ You should have received a copy of the G
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+#include "ansidecl.h"
#include "floatformat.h"
#include <math.h> /* ldexp */
-#ifdef __STDC__
+#ifdef ANSI_PROTOTYPES
#include <stddef.h>
extern void *memcpy (void *s1, const void *s2, size_t n);
extern void *memset (void *s, int c, size_t n);
diff -rup orig/egcc-CVS20030415/libiberty/getcwd.c egcc-CVS20030415/libiberty/getcwd.c
--- orig/egcc-CVS20030415/libiberty/getcwd.c 2001-10-07 17:53:31.000000000 -0400
+++ egcc-CVS20030415/libiberty/getcwd.c 2003-04-15 16:06:47.585635000 -0400
@@ -40,7 +40,7 @@ extern int errno;
char *
getcwd (buf, len)
char *buf;
- int len;
+ size_t len;
{
char ourbuf[MAXPATHLEN];
char *result;
diff -rup orig/egcc-CVS20030415/libiberty/hashtab.c egcc-CVS20030415/libiberty/hashtab.c
--- orig/egcc-CVS20030415/libiberty/hashtab.c 2003-03-17 17:44:29.000000000 -0500
+++ egcc-CVS20030415/libiberty/hashtab.c 2003-04-15 16:06:47.595657000 -0400
@@ -634,9 +634,6 @@ htab_traverse (htab, callback, info)
htab_trav callback;
PTR info;
{
- PTR *slot;
- PTR *limit;
-
if ((htab->n_elements - htab->n_deleted) * 8 < htab->size)
htab_expand (htab);
diff -rup orig/egcc-CVS20030415/libiberty/rename.c egcc-CVS20030415/libiberty/rename.c
--- orig/egcc-CVS20030415/libiberty/rename.c 2001-09-26 14:16:17.000000000 -0400
+++ egcc-CVS20030415/libiberty/rename.c 2003-04-15 16:06:47.605610000 -0400
@@ -12,6 +12,7 @@ exists, it is removed.
*/
+#include "ansidecl.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -22,8 +23,8 @@ exists, it is removed.
int
rename (zfrom, zto)
- char *zfrom;
- char *zto;
+ const char *zfrom;
+ const char *zto;
{
if (link (zfrom, zto) < 0)
{
diff -rup orig/egcc-CVS20030415/libiberty/strsignal.c egcc-CVS20030415/libiberty/strsignal.c
--- orig/egcc-CVS20030415/libiberty/strsignal.c 2001-10-17 17:15:41.000000000 -0400
+++ egcc-CVS20030415/libiberty/strsignal.c 2003-04-15 16:06:47.605642000 -0400
@@ -42,7 +42,7 @@ extern PTR memset ();
#undef sys_nsig
#ifndef NULL
-# ifdef __STDC__
+# ifdef ANSI_PROTOTYPES
# define NULL (void *) 0
# else
# define NULL 0
diff -rup orig/egcc-CVS20030415/libiberty/strstr.c egcc-CVS20030415/libiberty/strstr.c
--- orig/egcc-CVS20030415/libiberty/strstr.c 2001-10-07 17:53:31.000000000 -0400
+++ egcc-CVS20030415/libiberty/strstr.c 2003-04-15 16:06:47.615612000 -0400
@@ -27,8 +27,8 @@ strstr (s1, s2)
register char *p = s1;
extern char *strchr ();
extern int strncmp ();
-#if __GNUC__==2
- extern __SIZE_TYPE__ strlen ();
+#if __GNUC__ >= 2
+ extern __SIZE_TYPE__ strlen (const char *);
#endif
register int len = strlen (s2);
diff -rup orig/egcc-CVS20030415/libiberty/vfprintf.c egcc-CVS20030415/libiberty/vfprintf.c
--- orig/egcc-CVS20030415/libiberty/vfprintf.c 1998-09-05 06:42:19.000000000 -0400
+++ egcc-CVS20030415/libiberty/vfprintf.c 2003-04-15 16:06:47.615627000 -0400
@@ -3,7 +3,8 @@
Copyright (C) 1998 Free Software Foundation, Inc.
*/
-#ifdef __STDC__
+#include "ansidecl.h"
+#ifdef ANSI_PROTOTYPES
#include <stdarg.h>
#else
#include <varargs.h>
diff -rup orig/egcc-CVS20030415/libiberty/vprintf.c egcc-CVS20030415/libiberty/vprintf.c
--- orig/egcc-CVS20030415/libiberty/vprintf.c 2001-09-26 14:16:17.000000000 -0400
+++ egcc-CVS20030415/libiberty/vprintf.c 2003-04-15 16:06:47.625611000 -0400
@@ -15,13 +15,13 @@ nonstandard but common function @code{_d
*/
-#ifdef __STDC__
+#include <ansidecl.h>
+#ifdef ANSI_PROTOTYPES
#include <stdarg.h>
#else
#include <varargs.h>
#endif
#include <stdio.h>
-#include <ansidecl.h>
#undef vprintf
int
vprintf (format, ap)
diff -rup orig/egcc-CVS20030415/libiberty/vsprintf.c egcc-CVS20030415/libiberty/vsprintf.c
--- orig/egcc-CVS20030415/libiberty/vsprintf.c 2002-01-22 15:03:29.000000000 -0500
+++ egcc-CVS20030415/libiberty/vsprintf.c 2003-04-15 16:06:47.625628000 -0400
@@ -26,9 +26,13 @@ the resulting executable to be covered b
This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. */
+#include <ansidecl.h>
+#ifdef ANSI_PROTOTYPES
+#include <stdarg.h>
+#else
#include <varargs.h>
+#endif
#include <stdio.h>
-#include <ansidecl.h>
#undef vsprintf
#if defined _IOSTRG && defined _IOWRT
diff -rup orig/egcc-CVS20030415/libiberty/Makefile.in egcc-CVS20030415/libiberty/Makefile.in
--- orig/egcc-CVS20030415/libiberty/Makefile.in 2003-03-23 20:11:19.000000000 -0500
+++ egcc-CVS20030415/libiberty/Makefile.in 2003-04-15 16:07:08.634062000 -0400
@@ -423,7 +423,7 @@ atexit.o: config.h
basename.o: $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
$(INCDIR)/safe-ctype.h
bsearch.o: config.h $(INCDIR)/ansidecl.h
-calloc.o: $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
+calloc.o: $(INCDIR)/ansidecl.h
choose-temp.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
clock.o: config.h
concat.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
@@ -431,7 +431,7 @@ copysign.o: $(INCDIR)/ansidecl.h
cp-demangle.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/demangle.h \
$(INCDIR)/dyn-string.h $(INCDIR)/getopt.h $(INCDIR)/libiberty.h
cplus-dem.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/demangle.h \
- $(INCDIR)/getopt.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
+ $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
dyn-string.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/dyn-string.h \
$(INCDIR)/libiberty.h
fdmatch.o: $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
@@ -451,7 +451,8 @@ hex.o: $(INCDIR)/ansidecl.h $(INCDIR)/li
lbasename.o: $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
$(INCDIR)/safe-ctype.h
lrealpath.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
-make-relative-prefix.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
+make-relative-prefix.o: config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
make-temp-file.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
md5.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/md5.h
memchr.o: $(INCDIR)/ansidecl.h
@@ -464,18 +465,23 @@ objalloc.o: config.h $(INCDIR)/ansidecl.
obstack.o: config.h $(INCDIR)/obstack.h
partition.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
$(INCDIR)/partition.h
-pex-djgpp.o: config.h pex-common.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
-pex-mpw.o: config.h pex-common.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
-pex-msdos.o: config.h pex-common.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
- $(INCDIR)/safe-ctype.h
-pex-os2.o: config.h pex-common.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
-pex-unix.o: config.h pex-common.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
-pex-win32.o: config.h pex-common.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
-physmem.o: config.h $(INCDIR)/libiberty.h
+pex-djgpp.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+ $(srcdir)/pex-common.h
+pex-mpw.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+ $(srcdir)/pex-common.h
+pex-msdos.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+ $(srcdir)/pex-common.h $(INCDIR)/safe-ctype.h
+pex-os2.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+ $(srcdir)/pex-common.h
+pex-unix.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+ $(srcdir)/pex-common.h
+pex-win32.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+ $(srcdir)/pex-common.h
+physmem.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
putenv.o: config.h $(INCDIR)/ansidecl.h
random.o: $(INCDIR)/ansidecl.h
regex.o: config.h $(INCDIR)/xregex.h $(INCDIR)/xregex2.h
-rename.o: config.h
+rename.o: config.h $(INCDIR)/ansidecl.h
safe-ctype.o: $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h
setenv.o: config.h $(INCDIR)/ansidecl.h
sigsetmask.o: $(INCDIR)/ansidecl.h
@@ -486,6 +492,7 @@ splay-tree.o: config.h $(INCDIR)/ansidec
$(INCDIR)/splay-tree.h
strcasecmp.o: $(INCDIR)/ansidecl.h
strchr.o: $(INCDIR)/ansidecl.h
+strdup.o: $(INCDIR)/ansidecl.h
strerror.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
strncasecmp.o: $(INCDIR)/ansidecl.h
strncmp.o: $(INCDIR)/ansidecl.h
@@ -498,6 +505,7 @@ ternary.o: config.h $(INCDIR)/ansidecl.h
$(INCDIR)/ternary.h
vasprintf.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
vfork.o: $(INCDIR)/ansidecl.h
+vfprintf.o: $(INCDIR)/ansidecl.h
vprintf.o: $(INCDIR)/ansidecl.h
vsprintf.o: $(INCDIR)/ansidecl.h
waitpid.o: config.h