merge from gcc

This commit is contained in:
DJ Delorie 2011-11-02 22:02:55 +00:00
parent 6652d298c0
commit cf185ad7a9
2 changed files with 19 additions and 8 deletions

View File

@ -1,3 +1,10 @@
2011-11-02 Doug Evans <dje@google.com>
* Makefile.in (CFILES): Add timeval-utils.c.
(REQUIRED_OFILES): Add timeval-utils.$(objext).
(INSTALLED_HEADERS): Add timeval-utils.h.
(timeval-utils.$(objext)): Add rule.
2011-10-28 Ian Lance Taylor <iant@google.com>
* setproctitle.c (setproctitle): Use "GNU/Linux" in comment.
@ -25,10 +32,6 @@
2011-09-28 Doug Evans <dje@google.com>
* timeval-utils.c: New file.
* Makefile.in (CFILES): Add it.
(REQUIRED_OFILES): Add timeval-utils.$(objext).
(INSTALLED_HEADERS): Add timeval-utils.h.
(timeval-utils.$(objext)): Add rule.
* argv.c (countargv): New function.

View File

@ -152,7 +152,7 @@ CFILES = alloca.c argv.c asprintf.c atexit.c \
strcasecmp.c strchr.c strdup.c strerror.c strncasecmp.c \
strncmp.c strrchr.c strsignal.c strstr.c strtod.c strtol.c \
strtoul.c strndup.c strverscmp.c \
tmpnam.c \
timeval-utils.c tmpnam.c \
unlink-if-ordinary.c \
vasprintf.c vfork.c vfprintf.c vprintf.c vsnprintf.c vsprintf.c \
waitpid.c \
@ -184,8 +184,8 @@ REQUIRED_OFILES = \
./simple-object-elf.$(objext) ./simple-object-mach-o.$(objext) \
./sort.$(objext) ./spaces.$(objext) \
./splay-tree.$(objext) ./stack-limit.$(objext) \
./strerror.$(objext) \
./strsignal.$(objext) ./unlink-if-ordinary.$(objext) \
./strerror.$(objext) ./strsignal.$(objext) \
./timeval-utils.$(objext) ./unlink-if-ordinary.$(objext) \
./xatexit.$(objext) ./xexit.$(objext) ./xmalloc.$(objext) \
./xmemdup.$(objext) ./xstrdup.$(objext) ./xstrerror.$(objext) \
./xstrndup.$(objext)
@ -235,7 +235,8 @@ INSTALLED_HEADERS = \
$(INCDIR)/partition.h \
$(INCDIR)/safe-ctype.h \
$(INCDIR)/sort.h \
$(INCDIR)/splay-tree.h
$(INCDIR)/splay-tree.h \
$(INCDIR)/timeval-utils.h
$(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
-rm -f $(TARGETLIB) pic/$(TARGETLIB)
@ -1141,6 +1142,13 @@ $(CONFIGURED_OFILES): stamp-picdir
else true; fi
$(COMPILE.c) $(srcdir)/strverscmp.c $(OUTPUT_OPTION)
./timeval-utils.$(objext): $(srcdir)/timeval-utils.c config.h \
$(INCDIR)/timeval-utils.h
if [ x"$(PICFLAG)" != x ]; then \
$(COMPILE.c) $(PICFLAG) $(srcdir)/timeval-utils.c -o pic/$@; \
else true; fi
$(COMPILE.c) $(srcdir)/timeval-utils.c $(OUTPUT_OPTION)
./tmpnam.$(objext): $(srcdir)/tmpnam.c
if [ x"$(PICFLAG)" != x ]; then \
$(COMPILE.c) $(PICFLAG) $(srcdir)/tmpnam.c -o pic/$@; \