mirrors/binutils-gdb
1
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-23 18:14:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Re: use libiberty xmalloc in bfd/doc/chew.c

Browse Source 
We can't use libiberty.a in chew.  libiberty is a host library, chew
a build program.  Partly revert commit 7273d78f3f, instead define
local versions of the libiberty functions.  ansidecl.h also isn't
needed.

	* doc/chew.c: Don't include libiberty.h or ansidecl.h.
	(xmalloc, xrealloc, xstrdup): New functions.
	* doc/local.mk (LIBIBERTY): Don't define or use.
	* Makefile.in: Regenerate.
This commit is contained in:
Alan Modra 2022-06-01 10:44:01 +09:30
parent 739f950664
commit b0de9ed86f
3 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bfd/Makefile.in
View File

@ -1301,7 +1301,6 @@ doc_bfd_TEXINFOS = $(DOCFILES) doc/bfdsumm.texi
AM_MAKEINFOFLAGS = --no-split -I "$(srcdir)/doc" -I doc
TEXI2DVI = texi2dvi -I "$(srcdir)/doc" -I doc
MKDOC = doc/chew$(EXEEXT_FOR_BUILD)
LIBIBERTY = ../libiberty/libiberty.a
# We can't replace these rules with an implicit rule, because
# makes without VPATH support couldn't find the .h files in `..'.
@ -2488,7 +2487,7 @@ doc/chew.stamp: $(srcdir)/doc/chew.c doc/$(am__dirstamp)
$(AM_V_CCLD)$(CC_FOR_BUILD) -o doc/chw$$$$$(EXEEXT_FOR_BUILD) $(CFLAGS_FOR_BUILD) \
$(LDFLAGS_FOR_BUILD) $(H_CFLAGS) \
-I. -I$(srcdir) -Idoc -I$(srcdir)/../include -I$(srcdir)/../intl -I../intl \
$(srcdir)/doc/chew.c $(LIBIBERTY) && \
$(srcdir)/doc/chew.c && \
$(SHELL) $(srcdir)/../move-if-change \
doc/chw$$$$$(EXEEXT_FOR_BUILD) $(MKDOC) && \
touch $@

41
bfd/doc/chew.c
View File

@ -81,8 +81,6 @@
Foo. */
#include "ansidecl.h"
#include "libiberty.h"
#include <assert.h>
#include <stdio.h>
#include <ctype.h>
@ -145,6 +143,45 @@ die (char *msg)
exit (1);
}
void *
xmalloc (size_t size)
{
void *newmem;
if (size == 0)
size = 1;
newmem = malloc (size);
if (!newmem)
die ("out of memory");
return newmem;
}
void *
xrealloc (void *oldmem, size_t size)
{
void *newmem;
if (size == 0)
size = 1;
if (!oldmem)
newmem = malloc (size);
else
newmem = realloc (oldmem, size);
if (!newmem)
die ("out of memory");
return newmem;
}
char *
xstrdup (const char *s)
{
size_t len = strlen (s) + 1;
char *ret = xmalloc (len);
return memcpy (ret, s, len);
}
static void
init_string_with_size (string_type *buffer, unsigned int size)
{

4
bfd/doc/local.mk
View File

@ -82,14 +82,12 @@ TEXI2DVI = texi2dvi -I "$(srcdir)/%D%" -I %D%
MKDOC = %D%/chew$(EXEEXT_FOR_BUILD)
LIBIBERTY = ../libiberty/libiberty.a
$(MKDOC): %D%/chew.stamp ; @true
%D%/chew.stamp: $(srcdir)/%D%/chew.c %D%/$(am__dirstamp)
$(AM_V_CCLD)$(CC_FOR_BUILD) -o %D%/chw$$$$$(EXEEXT_FOR_BUILD) $(CFLAGS_FOR_BUILD) \
$(LDFLAGS_FOR_BUILD) $(H_CFLAGS) \
-I. -I$(srcdir) -I%D% -I$(srcdir)/../include -I$(srcdir)/../intl -I../intl \
$(srcdir)/%D%/chew.c $(LIBIBERTY) && \
$(srcdir)/%D%/chew.c && \
$(SHELL) $(srcdir)/../move-if-change \
%D%/chw$$$$$(EXEEXT_FOR_BUILD) $(MKDOC) && \
touch $@