merge from gcc
This commit is contained in:
DJ Delorie
parent
25e2787005
commit
50d4562d6e
5 changed files with 234 additions and 144 deletions
|
|
@ -1,3 +1,14 @@
|
|||
2002-03-04 Phil Edwards <pme@gcc.gnu.org>
|
||||
|
||||
* configure.in: Add --enable-install-libiberty option.
|
||||
* Makefile.in (INSTALLED_HEADERS): New variable.
|
||||
(install_to_libdir): Possibly also copy headers.
|
||||
* configure: Regenerated.
|
||||
|
||||
2002-03-04 Neil Booth <neil@daikokuya.demon.co.uk>
|
||||
|
||||
* xmalloc.c (xmalloc_fail): Clarify error message further.
|
||||
|
||||
2002-03-03 Neil Booth <neil@daikokuya.demon.co.uk>
|
||||
|
||||
* xmalloc.c (xmalloc_fail): Clarify error message.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Makefile
|
||||
# Copyright (C) 1990, 91-99, 2000, 2001
|
||||
# Copyright (C) 1990, 91-99, 2000, 2001, 2002
|
||||
# Free Software Foundation
|
||||
#
|
||||
# This file is part of the libiberty library.
|
||||
|
|
@ -34,6 +34,8 @@ prefix = @prefix@
|
|||
exec_prefix = @exec_prefix@
|
||||
bindir = @bindir@
|
||||
libdir = @libdir@
|
||||
includedir = @includedir@
|
||||
target_header_dir = @target_header_dir@
|
||||
|
||||
SHELL = @SHELL@
|
||||
|
||||
|
|
@ -48,6 +50,7 @@ MULTICLEAN = true
|
|||
INSTALL = @INSTALL@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
mkinstalldirs = $(SHELL) $(srcdir)/../mkinstalldirs
|
||||
|
||||
AR = @AR@
|
||||
AR_FLAGS = rc
|
||||
|
|
@ -181,6 +184,22 @@ CONFIGURED_OFILES = asprintf.o atexit.o \
|
|||
vasprintf.o vfork.o vfprintf.o vprintf.o vsprintf.o \
|
||||
waitpid.o
|
||||
|
||||
# These files are installed if the library has been configured to do so.
|
||||
INSTALLED_HEADERS = \
|
||||
$(INCDIR)/ansidecl.h \
|
||||
$(INCDIR)/demangle.h \
|
||||
$(INCDIR)/dyn-string.h \
|
||||
$(INCDIR)/fibheap.h \
|
||||
$(INCDIR)/floatformat.h \
|
||||
$(INCDIR)/hashtab.h \
|
||||
$(INCDIR)/libiberty.h \
|
||||
$(INCDIR)/objalloc.h \
|
||||
$(INCDIR)/partition.h \
|
||||
$(INCDIR)/safe-ctype.h \
|
||||
$(INCDIR)/sort.h \
|
||||
$(INCDIR)/splay-tree.h \
|
||||
$(INCDIR)/ternary.h
|
||||
|
||||
$(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
|
||||
-rm -f $(TARGETLIB) pic/$(TARGETLIB)
|
||||
$(AR) $(AR_FLAGS) $(TARGETLIB) \
|
||||
|
|
@ -240,6 +259,16 @@ install_to_libdir: all
|
|||
$(INSTALL_DATA) $(TARGETLIB) $(libdir)$(MULTISUBDIR)/$(TARGETLIB)n
|
||||
( cd $(libdir)$(MULTISUBDIR) ; $(RANLIB) $(TARGETLIB)n )
|
||||
mv -f $(libdir)$(MULTISUBDIR)/$(TARGETLIB)n $(libdir)$(MULTISUBDIR)/$(TARGETLIB)
|
||||
if test -n "${target_header_dir}"; then \
|
||||
case "${target_header_dir}" in \
|
||||
/*) thd=${target_header_dir};; \
|
||||
*) thd=${includedir}${MULTISUBDIR}/${target_header_dir};; \
|
||||
esac; \
|
||||
${mkinstalldirs} $${thd}; \
|
||||
for h in ${INSTALLED_HEADERS}; do \
|
||||
${INSTALL_DATA} $$h $${thd}; \
|
||||
done; \
|
||||
fi
|
||||
@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
|
||||
|
||||
install_to_tooldir: all
|
||||
|
|
|
|||
303
libiberty/configure
vendored
303
libiberty/configure
vendored
File diff suppressed because it is too large
Load diff
|
|
@ -205,6 +205,7 @@ fi
|
|||
|
||||
setobjs=
|
||||
CHECK=
|
||||
target_header_dir=
|
||||
if test -n "${with_target_subdir}"; then
|
||||
|
||||
# We are being configured as a target library. AC_REPLACE_FUNCS
|
||||
|
|
@ -239,6 +240,27 @@ if test -n "${with_target_subdir}"; then
|
|||
|
||||
fi
|
||||
|
||||
# We may wish to install the target headers somewhere.
|
||||
AC_ARG_ENABLE(install-libiberty,
|
||||
[ --enable-install-libiberty Install headers for end users],
|
||||
enable_install_libiberty=$enableval,
|
||||
enable_install_libiberty=no)dnl
|
||||
|
||||
# Option parsed, now set things appropriately.
|
||||
case x"$enable_install_libiberty" in
|
||||
xyes|x)
|
||||
target_header_dir=libiberty
|
||||
;;
|
||||
xno)
|
||||
target_header_dir=
|
||||
;;
|
||||
*)
|
||||
# This could be sanity-checked in various ways...
|
||||
target_header_dir="${enable_install_libiberty}"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
else
|
||||
|
||||
# Not a target library, so we set things up to run the test suite.
|
||||
|
|
@ -247,6 +269,7 @@ else
|
|||
fi
|
||||
|
||||
AC_SUBST(CHECK)
|
||||
AC_SUBST(target_header_dir)
|
||||
|
||||
case "${host}" in
|
||||
*-*-cygwin* | *-*-mingw*)
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ xmalloc_failed (size)
|
|||
else
|
||||
allocated = (char *) sbrk (0) - (char *) &environ;
|
||||
fprintf (stderr,
|
||||
"\n%s%sout of memory allocating %lu bytes after allocating %lu bytes\n",
|
||||
"\n%s%sout of memory allocating %lu bytes after a total of %lu bytes\n",
|
||||
name, *name ? ": " : "",
|
||||
(unsigned long) size, (unsigned long) allocated);
|
||||
#else /* HAVE_SBRK */
|
||||
|
|
|
|||
Loading…
Reference in a new issue