Index: gcc/libiberty/Makefile.in |
diff --git a/gcc/libiberty/Makefile.in b/gcc/libiberty/Makefile.in |
index 41a71f5ea32f0af2565a5404ada816a46e9d4550..f22d3a341f41a475552690fdb53fa105b5237cfa 100644 |
--- a/gcc/libiberty/Makefile.in |
+++ b/gcc/libiberty/Makefile.in |
@@ -100,8 +100,8 @@ FLAGS_TO_PASS = \ |
SUBDIRS = testsuite |
# FIXME: add @BUILD_INFO@ once we're sure it works for everyone. |
-all: stamp-picdir $(TARGETLIB) needed-list required-list all-subdir |
- @: $(MAKE) ; exec $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all |
+all: stamp-picdir $(TARGETLIB) required-list all-subdir |
+ @: $(MAKE) ; $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all |
.PHONY: check installcheck |
check: check-subdir |
@@ -124,7 +124,7 @@ COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) $(CPPFLAGS) -I. -I$(INCDIR) $(HDEFINES) @a |
CFILES = alloca.c argv.c asprintf.c atexit.c \ |
basename.c bcmp.c bcopy.c bsearch.c bzero.c \ |
calloc.c choose-temp.c clock.c concat.c cp-demangle.c \ |
- cp-demint.c cplus-dem.c \ |
+ cp-demint.c cplus-dem.c crc32.c \ |
dyn-string.c \ |
fdmatch.c ffs.c fibheap.c filename_cmp.c floatformat.c \ |
fnmatch.c fopen_unlocked.c \ |
@@ -135,8 +135,8 @@ CFILES = alloca.c argv.c asprintf.c atexit.c \ |
lbasename.c \ |
lrealpath.c \ |
make-relative-prefix.c \ |
- make-temp-file.c md5.c memchr.c memcmp.c memcpy.c memmove.c \ |
- mempcpy.c memset.c mkstemps.c \ |
+ make-temp-file.c md5.c memchr.c memcmp.c memcpy.c memmem.c \ |
+ memmove.c mempcpy.c memset.c mkstemps.c \ |
objalloc.c obstack.c \ |
partition.c pexecute.c \ |
pex-common.c pex-djgpp.c pex-msdos.c pex-one.c \ |
@@ -160,7 +160,7 @@ CFILES = alloca.c argv.c asprintf.c atexit.c \ |
REQUIRED_OFILES = \ |
./regex.o ./cplus-dem.o ./cp-demangle.o ./md5.o ./sha1.o \ |
./alloca.o ./argv.o \ |
- ./choose-temp.o ./concat.o ./cp-demint.o \ |
+ ./choose-temp.o ./concat.o ./cp-demint.o ./crc32.o \ |
./dyn-string.o \ |
./fdmatch.o ./fibheap.o ./filename_cmp.o ./floatformat.o \ |
./fnmatch.o ./fopen_unlocked.o \ |
@@ -187,8 +187,8 @@ CONFIGURED_OFILES = ./asprintf.o ./atexit.o \ |
./ffs.o \ |
./getcwd.o ./getpagesize.o ./gettimeofday.o \ |
./index.o ./insque.o \ |
- ./memchr.o ./memcmp.o ./memcpy.o ./memmove.o ./mempcpy.o \ |
- ./memset.o ./mkstemps.o \ |
+ ./memchr.o ./memcmp.o ./memcpy.o ./memmem.o ./memmove.o \ |
+ ./mempcpy.o ./memset.o ./mkstemps.o \ |
./pex-djgpp.o ./pex-msdos.o \ |
./pex-unix.o ./pex-win32.o \ |
./putenv.o \ |
@@ -264,14 +264,14 @@ HTMLS = libiberty.html |
html: $(HTMLS) |
-.PHONY: install-html install-html-am install-html-recursive |
+.PHONY: install-html install-html-am |
NORMAL_INSTALL = : |
mkdir_p = mkdir -p -- |
html__strip_dir = `echo $$p | sed -e 's|^.*/||'`; |
-install-html: install-html-recursive install-html-am |
+install-html: install-html-am |
install-html-am: $(HTMLS) |
@$(NORMAL_INSTALL) |
@@ -290,31 +290,6 @@ install-html-am: $(HTMLS) |
fi; \ |
done |
-install-html-recursive: |
- @failcom='exit 1'; \ |
- for f in x $$MAKEFLAGS; do \ |
- case $$f in \ |
- *=* | --[!k]*);; \ |
- *k*) failcom='fail=yes';; \ |
- esac; \ |
- done; \ |
- dot_seen=no; \ |
- target=`echo $@ | sed s/-recursive//`; \ |
- list='$(SUBDIRS)'; for subdir in $$list; do \ |
- echo "Making $$target in $$subdir"; \ |
- if test "$$subdir" = "."; then \ |
- dot_seen=yes; \ |
- local_target="$$target-am"; \ |
- else \ |
- local_target="$$target"; \ |
- fi; \ |
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
- || eval $$failcom; \ |
- done; \ |
- if test "$$dot_seen" = "no"; then \ |
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
- fi; test -z "$$fail" |
- |
TEXISRC = \ |
$(srcdir)/libiberty.texi \ |
$(srcdir)/copying-lib.texi \ |
@@ -377,22 +352,6 @@ install_to_tooldir: all |
mv -f $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB) |
@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install |
-# needed-list is used by libstdc++. NEEDED is the list of functions |
-# to include there. Do not add anything LGPL to this list; libstdc++ |
-# can't use anything encumbering. |
-NEEDED = atexit calloc memchr memcmp memcpy memmove memset rename strchr \ |
- strerror strncmp strrchr strstr strtol strtoul tmpnam vfprintf vprintf \ |
- vfork waitpid bcmp bcopy bzero |
-needed-list: Makefile |
- rm -f needed-list; touch needed-list; \ |
- for f in $(NEEDED); do \ |
- for g in $(LIBOBJS) $(EXTRA_OFILES); do \ |
- case "$$g" in \ |
- *$$f*) echo $$g >> needed-list ;; \ |
- esac; \ |
- done; \ |
- done |
- |
# required-list was used when building a shared bfd/opcodes/libiberty |
# library. I don't know if it used by anything currently. |
required-list: Makefile |
@@ -412,10 +371,12 @@ TAGS: $(CFILES) |
etags `for i in $(CFILES); do echo $(srcdir)/$$i ; done` |
# The standalone demangler (c++filt) has been moved to binutils. |
-demangle: |
+# But make this target work anyway for demangler hacking. |
+demangle: $(ALL) $(srcdir)/cp-demangle.c |
@echo "The standalone demangler, now named c++filt, is now" |
@echo "a part of binutils." |
- @false |
+ $(CC) @DEFS@ $(CFLAGS) $(CPPFLAGS) -I. -I$(INCDIR) $(HDEFINES) \ |
+ $(srcdir)/cp-demangle.c -DSTANDALONE_DEMANGLER $(TARGETLIB) -o $@ |
ls: |
@echo Makefile $(CFILES) |
@@ -440,8 +401,8 @@ maint-deps : |
# multiple times, hence our explicit recursion with an empty SUBDIRS. |
mostlyclean: mostlyclean-subdir |
-rm -rf *.o pic core errs \#* *.E a.out |
- -rm -f needed.awk needed2.awk errors dummy needed-list config.h stamp-* |
- -rm -f $(CONFIG_H) $(NEEDED_LIST) stamp-picdir |
+ -rm -f errors dummy config.h stamp-* |
+ -rm -f $(CONFIG_H) stamp-picdir |
-rm -f libiberty.aux libiberty.cp libiberty.cps libiberty.fn libiberty.ky |
-rm -f libiberty.log libiberty.tmp libiberty.tps libiberty.pg |
-rm -f libiberty.pgs libiberty.toc libiberty.tp libiberty.tpl libiberty.vr |
@@ -475,6 +436,16 @@ stamp-h: $(srcdir)/config.in config.status Makefile |
config.status: $(srcdir)/configure |
$(SHELL) ./config.status --recheck |
+AUTOCONF = autoconf |
+configure_deps = $(srcdir)/aclocal.m4 \ |
+ $(srcdir)/../config/acx.m4 \ |
+ $(srcdir)/../config/no-executables.m4 \ |
+ $(srcdir)/../config/override.m4 \ |
+ $(srcdir)/../config/warnings.m4 \ |
+ |
+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(configure_deps) |
+ cd $(srcdir) && $(AUTOCONF) |
+ |
# Depending on config.h makes sure that config.status has been re-run |
# if needed. This prevents problems with parallel builds, in case |
# subdirectories need to run config.status also. |
@@ -619,6 +590,12 @@ $(CONFIGURED_OFILES): stamp-picdir |
else true; fi |
$(COMPILE.c) $(srcdir)/cplus-dem.c $(OUTPUT_OPTION) |
+./crc32.o: $(srcdir)/crc32.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h |
+ if [ x"$(PICFLAG)" != x ]; then \ |
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/crc32.c -o pic/$@; \ |
+ else true; fi |
+ $(COMPILE.c) $(srcdir)/crc32.c $(OUTPUT_OPTION) |
+ |
./dyn-string.o: $(srcdir)/dyn-string.c config.h $(INCDIR)/ansidecl.h \ |
$(INCDIR)/dyn-string.h $(INCDIR)/libiberty.h |
if [ x"$(PICFLAG)" != x ]; then \ |
@@ -798,6 +775,12 @@ $(CONFIGURED_OFILES): stamp-picdir |
else true; fi |
$(COMPILE.c) $(srcdir)/memcpy.c $(OUTPUT_OPTION) |
+./memmem.o: $(srcdir)/memmem.c config.h |
+ if [ x"$(PICFLAG)" != x ]; then \ |
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/memmem.c -o pic/$@; \ |
+ else true; fi |
+ $(COMPILE.c) $(srcdir)/memmem.c $(OUTPUT_OPTION) |
+ |
./memmove.o: $(srcdir)/memmove.c $(INCDIR)/ansidecl.h |
if [ x"$(PICFLAG)" != x ]; then \ |
$(COMPILE.c) $(PICFLAG) $(srcdir)/memmove.c -o pic/$@; \ |