svn commit: r565971 - in head/devel: . dwz dwz/files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Thu Feb 18 19:44:41 UTC 2021
Author: amdmi3
Date: Thu Feb 18 19:44:39 2021
New Revision: 565971
URL: https://svnweb.freebsd.org/changeset/ports/565971
Log:
- Add devel/dwz: DWARF optimization and duplicate removal tool
dwz is a program that attempts to optimize DWARF debugging information
contained in ELF shared libraries and ELF executables for size, by
replacing DWARF information representation with equivalent smaller
representation where possible and by reducing the amount of duplication
using techniques from DWARF standard appendix E - creating
DW_TAG_partial_unit compilation units (CUs) for duplicated information
and using DW_TAG_imported_unit to import it into each CU that needs it.
WWW: https://sourceware.org/dwz/
PR: 245382
Submitted by: bcallah at openbsd.org
Added:
head/devel/dwz/
head/devel/dwz/Makefile (contents, props changed)
head/devel/dwz/distinfo (contents, props changed)
head/devel/dwz/files/
head/devel/dwz/files/patch-Makefile (contents, props changed)
head/devel/dwz/files/patch-dwz.c (contents, props changed)
head/devel/dwz/files/patch-hashtab.c (contents, props changed)
head/devel/dwz/files/patch-obstack.c (contents, props changed)
head/devel/dwz/files/patch-obstack.h (contents, props changed)
head/devel/dwz/files/patch-sha1.c (contents, props changed)
head/devel/dwz/pkg-descr (contents, props changed)
head/devel/dwz/pkg-plist (contents, props changed)
Modified:
head/devel/Makefile
Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile Thu Feb 18 19:24:47 2021 (r565970)
+++ head/devel/Makefile Thu Feb 18 19:44:39 2021 (r565971)
@@ -521,6 +521,7 @@
SUBDIR += dwarf2json
SUBDIR += dwarfdump
SUBDIR += dwarves
+ SUBDIR += dwz
SUBDIR += dxa65
SUBDIR += dyncall
SUBDIR += e00compr
Added: head/devel/dwz/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/dwz/Makefile Thu Feb 18 19:44:39 2021 (r565971)
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= dwz
+DISTVERSION= 0.13
+CATEGORIES= devel
+MASTER_SITES= https://sourceware.org/ftp/dwz/releases/
+
+MAINTAINER= bcallah at openbsd.org
+COMMENT= DWARF optimization and duplicate removal tool
+
+LICENSE= GPLv3+
+LICENSE_FILE= ${WRKSRC}/COPYING3
+
+WRKSRC= ${WRKDIR}/${PORTNAME}
+
+.include <bsd.port.mk>
Added: head/devel/dwz/distinfo
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/dwz/distinfo Thu Feb 18 19:44:39 2021 (r565971)
@@ -0,0 +1,3 @@
+TIMESTAMP = 1586106922
+SHA256 (dwz-0.13.tar.gz) = 05166ad9d3173e92a517ef94aa2b149bca7d717a8c2ea88e28e4e39670c491ec
+SIZE (dwz-0.13.tar.gz) = 143279
Added: head/devel/dwz/files/patch-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/dwz/files/patch-Makefile Thu Feb 18 19:44:39 2021 (r565971)
@@ -0,0 +1,54 @@
+--- Makefile.orig 2019-10-02 10:26:03.011230367 -0400
++++ Makefile 2020-04-05 14:21:31.102940000 -0400
+@@ -1,22 +1,17 @@
+-ifneq ($(srcdir),)
+-VPATH = $(srcdir)
+-else
+-srcdir=$(shell pwd)
+-endif
+-CFLAGS = -O2 -g
+-DWZ_VERSION := $(shell cat $(srcdir)/VERSION)
+-override CFLAGS += -Wall -W -D_FILE_OFFSET_BITS=64 -DDWZ_VERSION='"$(DWZ_VERSION)"'
+-prefix = /usr
++srcdir = .
++DWZ_VERSION != cat $(srcdir)/VERSION
++CFLAGS += -D_FILE_OFFSET_BITS=64 -DDWZ_VERSION='"$(DWZ_VERSION)"'
++prefix = ${PREFIX}
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+ datarootdir = $(prefix)/share
+-mandir = $(datarootdir)/man
+-OBJECTS = dwz.o hashtab.o sha1.o dwarfnames.o
+-dwz: $(OBJECTS)
+- $(CC) $(LDFLAGS) -o $@ $^ -lelf
+-install: dwz
+- install -D dwz $(DESTDIR)$(bindir)/dwz
+- install -D -m 644 $(srcdir)/dwz.1 $(DESTDIR)$(mandir)/man1/dwz.1
++mandir = $(prefix)/man
++OBJECTS = dwz.o hashtab.o sha1.o dwarfnames.o obstack.o
++all: $(OBJECTS)
++ $(CC) $(LDFLAGS) -o dwz ${OBJECTS} -lelf
++install: all
++ install -c -s dwz $(DESTDIR)$(bindir)/dwz
++ install -c -m 644 $(srcdir)/dwz.1 $(DESTDIR)$(mandir)/man1/dwz.1
+ clean:
+ rm -f $(OBJECTS) *~ core* dwz $(TEST_EXECS) $(DWZ_TEST_SOURCES) \
+ dwz.log dwz.sum
+@@ -51,7 +46,7 @@ DWZ_TEST_SOURCES := $(patsubst %.o,%-for-test.c,$(OBJE
+ sed 's/__GNUC__/NOT_DEFINED/' $< > $@
+
+ dwz-for-test: $(DWZ_TEST_SOURCES)
+- $(CC) $(DWZ_TEST_SOURCES) -O2 -g -lelf -o $@ -Wall -W -DDEVEL \
++ $(CC) $(DWZ_TEST_SOURCES) -O2 -g -lelf -o $@ -DDEVEL \
+ -D_FILE_OFFSET_BITS=64 -DDWZ_VERSION='"for-test"' -I$(srcdir)
+
+ min:
+@@ -84,7 +79,7 @@ varval:
+ # WARNING: Couldn't find the global config file.
+ DEJAGNU ?= /dev/null
+
+-check: dwz $(TEST_EXECS)
++check: all $(TEST_EXECS)
+ mkdir -p testsuite-bin
+ cd testsuite-bin; ln -sf $(PWD)/dwz .
+ export DEJAGNU=$(DEJAGNU); \
Added: head/devel/dwz/files/patch-dwz.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/dwz/files/patch-dwz.c Thu Feb 18 19:44:39 2021 (r565971)
@@ -0,0 +1,108 @@
+--- dwz.c.orig 2019-10-02 10:26:03.015230341 -0400
++++ dwz.c 2020-04-05 14:12:16.054408000 -0400
+@@ -20,11 +20,11 @@
+
+ #include <assert.h>
+ #include <errno.h>
+-#include <error.h>
+ #include <fcntl.h>
+ #include <getopt.h>
+ #include <setjmp.h>
+ #include <string.h>
++#include <stdarg.h>
+ #include <stdbool.h>
+ #include <stddef.h>
+ #include <stdint.h>
+@@ -34,7 +34,7 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+
+-#include <obstack.h>
++#include "obstack.h"
+
+ #include <gelf.h>
+ #include "dwarf2.h"
+@@ -136,6 +136,29 @@ dwz_oom (void)
+ longjmp (oom_buf, 1);
+ }
+
++/* error () wrapper based on the Linux manual page at
++ http://man7.org/linux/man-pages/man3/error.3.html. */
++static void
++error (int status, int errnum, const char *fmt, ...)
++{
++ va_list ap;
++
++ fprintf (stderr, "%s: ", getprogname());
++ if (fmt != NULL) {
++ va_start (ap, fmt);
++ vfprintf (stderr, fmt, ap);
++ va_end (ap);
++ }
++
++ if (errnum != 0)
++ fprintf (stderr, ": %s", strerror(errnum));
++
++ fputc ('\n', stderr);
++
++ if (status != 0)
++ exit (status);
++}
++
+ /* General obstack for struct dw_cu, dw_die, also used for temporary
+ vectors. */
+ static struct obstack ob;
+@@ -10300,7 +10323,7 @@ fdopen_dso (int fd, const char *name)
+ int i;
+ DSO *dso = NULL;
+
+- elf = elf_begin (fd, ELF_C_READ_MMAP, NULL);
++ elf = elf_begin (fd, ELF_C_READ, NULL);
+ if (elf == NULL)
+ {
+ error (0, 0, "cannot open ELF file: %s", elf_errmsg (-1));
+@@ -10338,7 +10361,7 @@ fdopen_dso (int fd, const char *name)
+ goto error_out;
+ }
+
+- elf_flagelf (elf, ELF_C_SET, ELF_F_LAYOUT | ELF_F_PERMISSIVE);
++ elf_flagelf (elf, ELF_C_SET, ELF_F_LAYOUT);
+
+ memset (dso, 0, sizeof(DSO));
+ dso->elf = elf;
+@@ -10829,7 +10852,7 @@ write_dso (DSO *dso, const char *file, struct stat *st
+ free (shstrtab);
+ return 1;
+ }
+- elf_flagelf (elf, ELF_C_SET, ELF_F_LAYOUT | ELF_F_PERMISSIVE);
++ elf_flagelf (elf, ELF_C_SET, ELF_F_LAYOUT);
+ for (i = 0; i < ehdr.e_phnum; ++i)
+ {
+ GElf_Phdr *phdr, phdr_mem;
+@@ -10902,7 +10925,7 @@ write_dso (DSO *dso, const char *file, struct stat *st
+ }
+ }
+
+- if (elf_update (elf, ELF_C_WRITE_MMAP) == -1)
++ if (elf_update (elf, ELF_C_WRITE) == -1)
+ {
+ error (0, 0, "%s: elf_update failed", dso->filename);
+ unlink (file);
+@@ -12089,7 +12112,7 @@ optimize_multifile (void)
+ error (0, 0, "Could not create new ELF headers");
+ goto fail;
+ }
+- elf_flagelf (elf, ELF_C_SET, ELF_F_LAYOUT | ELF_F_PERMISSIVE);
++ elf_flagelf (elf, ELF_C_SET, ELF_F_LAYOUT);
+
+ sha1_init_ctx (&ctx);
+ for (i = 0; debug_sections[i].name; i++)
+@@ -12176,7 +12199,7 @@ optimize_multifile (void)
+ data->d_off = 0;
+ data->d_align = 1;
+
+- if (elf_update (elf, ELF_C_WRITE_MMAP) == -1)
++ if (elf_update (elf, ELF_C_WRITE) == -1)
+ {
+ error (0, 0, "%s: elf_update failed", multifile);
+ goto fail;
Added: head/devel/dwz/files/patch-hashtab.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/dwz/files/patch-hashtab.c Thu Feb 18 19:44:39 2021 (r565971)
@@ -0,0 +1,13 @@
+--- hashtab.c.orig 2019-10-02 10:26:03.003230419 -0400
++++ hashtab.c 2020-04-05 14:12:16.089254000 -0400
+@@ -37,8 +37,8 @@ Boston, MA 02110-1301, USA. */
+ #include <stdio.h>
+ #include "hashtab.h"
+
+-#include <endian.h>
+-#if __BYTE_ORDER == __BIG_ENDIAN
++#include <sys/endian.h>
++#if _BYTE_ORDER == _BIG_ENDIAN
+ # define WORDS_BIGENDIAN 1
+ #endif
+
Added: head/devel/dwz/files/patch-obstack.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/dwz/files/patch-obstack.c Thu Feb 18 19:44:39 2021 (r565971)
@@ -0,0 +1,514 @@
+--- obstack.c.orig 2020-04-05 14:12:16.123238000 -0400
++++ obstack.c 2020-04-05 14:12:16.161009000 -0400
+@@ -0,0 +1,511 @@
++/* obstack.c - subroutines used implicitly by object stack macros
++ Copyright (C) 1988,89,90,91,92,93,94,96,97 Free Software Foundation, Inc.
++
++
++ NOTE: This source is derived from an old version taken from the GNU C
++ Library (glibc).
++
++ This program is free software; you can redistribute it and/or modify it
++ under the terms of the GNU General Public License as published by the
++ Free Software Foundation; either version 2, or (at your option) any
++ later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
++ USA. */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include "obstack.h"
++
++/* NOTE BEFORE MODIFYING THIS FILE: This version number must be
++ incremented whenever callers compiled using an old obstack.h can no
++ longer properly call the functions in this obstack.c. */
++#define OBSTACK_INTERFACE_VERSION 1
++
++/* Comment out all this code if we are using the GNU C Library, and are not
++ actually compiling the library itself, and the installed library
++ supports the same library interface we do. This code is part of the GNU
++ C Library, but also included in many other GNU distributions. Compiling
++ and linking in this code is a waste when using the GNU C library
++ (especially if it is a shared library). Rather than having every GNU
++ program understand `configure --with-gnu-libc' and omit the object
++ files, it is simpler to just do this in the source for each such file. */
++
++#include <stdio.h> /* Random thing to get __GNU_LIBRARY__. */
++#include <stdlib.h>
++#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1
++#include <gnu-versions.h>
++#if _GNU_OBSTACK_INTERFACE_VERSION == OBSTACK_INTERFACE_VERSION
++#define ELIDE_CODE
++#endif
++#endif
++
++
++#ifndef ELIDE_CODE
++
++
++#define POINTER void *
++
++/* Determine default alignment. */
++struct fooalign {char x; double d;};
++#define DEFAULT_ALIGNMENT \
++ ((PTR_INT_TYPE) ((char *) &((struct fooalign *) 0)->d - (char *) 0))
++/* If malloc were really smart, it would round addresses to DEFAULT_ALIGNMENT.
++ But in fact it might be less smart and round addresses to as much as
++ DEFAULT_ROUNDING. So we prepare for it to do that. */
++union fooround {long x; double d;};
++#define DEFAULT_ROUNDING (sizeof (union fooround))
++
++/* When we copy a long block of data, this is the unit to do it with.
++ On some machines, copying successive ints does not work;
++ in such a case, redefine COPYING_UNIT to `long' (if that works)
++ or `char' as a last resort. */
++#ifndef COPYING_UNIT
++#define COPYING_UNIT int
++#endif
++
++
++/* The functions allocating more room by calling `obstack_chunk_alloc'
++ jump to the handler pointed to by `obstack_alloc_failed_handler'.
++ This variable by default points to the internal function
++ `print_and_abort'. */
++static void print_and_abort (void);
++void (*obstack_alloc_failed_handler) (void) = print_and_abort;
++
++/* Exit value used when `print_and_abort' is used. */
++#if defined __GNU_LIBRARY__ || defined HAVE_STDLIB_H
++#include <stdlib.h>
++#endif
++#ifndef EXIT_FAILURE
++#define EXIT_FAILURE 1
++#endif
++int obstack_exit_failure = EXIT_FAILURE;
++
++/* The non-GNU-C macros copy the obstack into this global variable
++ to avoid multiple evaluation. */
++
++struct obstack *_obstack;
++
++/* Define a macro that either calls functions with the traditional malloc/free
++ calling interface, or calls functions with the mmalloc/mfree interface
++ (that adds an extra first argument), based on the state of use_extra_arg.
++ For free, do not use ?:, since some compilers, like the MIPS compilers,
++ do not allow (expr) ? void : void. */
++
++#if defined (__STDC__) && __STDC__
++#define CALL_CHUNKFUN(h, size) \
++ (((h) -> use_extra_arg) \
++ ? (*(h)->chunkfun) ((h)->extra_arg, (size)) \
++ : (*(struct _obstack_chunk *(*) (long)) (h)->chunkfun) ((size)))
++
++#define CALL_FREEFUN(h, old_chunk) \
++ do { \
++ if ((h) -> use_extra_arg) \
++ (*(h)->freefun) ((h)->extra_arg, (old_chunk)); \
++ else \
++ (*(void (*) (void *)) (h)->freefun) ((old_chunk)); \
++ } while (0)
++#else
++#define CALL_CHUNKFUN(h, size) \
++ (((h) -> use_extra_arg) \
++ ? (*(h)->chunkfun) ((h)->extra_arg, (size)) \
++ : (*(struct _obstack_chunk *(*) ()) (h)->chunkfun) ((size)))
++
++#define CALL_FREEFUN(h, old_chunk) \
++ do { \
++ if ((h) -> use_extra_arg) \
++ (*(h)->freefun) ((h)->extra_arg, (old_chunk)); \
++ else \
++ (*(void (*) ()) (h)->freefun) ((old_chunk)); \
++ } while (0)
++#endif
++
++
++/* Initialize an obstack H for use. Specify chunk size SIZE (0 means default).
++ Objects start on multiples of ALIGNMENT (0 means use default).
++ CHUNKFUN is the function to use to allocate chunks,
++ and FREEFUN the function to free them.
++
++ Return nonzero if successful, zero if out of memory.
++ To recover from an out of memory error,
++ free up some memory, then call this again. */
++
++int
++_obstack_begin (struct obstack *h, int size, int alignment,
++ POINTER (*chunkfun) (long), void (*freefun) (void *))
++{
++ register struct _obstack_chunk *chunk; /* points to new chunk */
++
++ if (alignment == 0)
++ alignment = (int) DEFAULT_ALIGNMENT;
++ if (size == 0)
++ /* Default size is what GNU malloc can fit in a 4096-byte block. */
++ {
++ /* 12 is sizeof (mhead) and 4 is EXTRA from GNU malloc.
++ Use the values for range checking, because if range checking is off,
++ the extra bytes won't be missed terribly, but if range checking is on
++ and we used a larger request, a whole extra 4096 bytes would be
++ allocated.
++
++ These number are irrelevant to the new GNU malloc. I suspect it is
++ less sensitive to the size of the request. */
++ int extra = ((((12 + DEFAULT_ROUNDING - 1) & ~(DEFAULT_ROUNDING - 1))
++ + 4 + DEFAULT_ROUNDING - 1)
++ & ~(DEFAULT_ROUNDING - 1));
++ size = 4096 - extra;
++ }
++
++ h->chunkfun = (struct _obstack_chunk * (*)(void *, long)) chunkfun;
++ h->freefun = (void (*) (void *, struct _obstack_chunk *)) freefun;
++ h->chunk_size = size;
++ h->alignment_mask = alignment - 1;
++ h->use_extra_arg = 0;
++
++ chunk = h->chunk = CALL_CHUNKFUN (h, h -> chunk_size);
++ if (!chunk)
++ (*obstack_alloc_failed_handler) ();
++ h->next_free = h->object_base = chunk->contents;
++ h->chunk_limit = chunk->limit
++ = (char *) chunk + h->chunk_size;
++ chunk->prev = 0;
++ /* The initial chunk now contains no empty object. */
++ h->maybe_empty_object = 0;
++ h->alloc_failed = 0;
++ return 1;
++}
++
++int
++_obstack_begin_1 (struct obstack *h, int size, int alignment,
++ POINTER (*chunkfun) (POINTER, long),
++ void (*freefun) (POINTER, POINTER), POINTER arg)
++{
++ register struct _obstack_chunk *chunk; /* points to new chunk */
++
++ if (alignment == 0)
++ alignment = (int) DEFAULT_ALIGNMENT;
++ if (size == 0)
++ /* Default size is what GNU malloc can fit in a 4096-byte block. */
++ {
++ /* 12 is sizeof (mhead) and 4 is EXTRA from GNU malloc.
++ Use the values for range checking, because if range checking is off,
++ the extra bytes won't be missed terribly, but if range checking is on
++ and we used a larger request, a whole extra 4096 bytes would be
++ allocated.
++
++ These number are irrelevant to the new GNU malloc. I suspect it is
++ less sensitive to the size of the request. */
++ int extra = ((((12 + DEFAULT_ROUNDING - 1) & ~(DEFAULT_ROUNDING - 1))
++ + 4 + DEFAULT_ROUNDING - 1)
++ & ~(DEFAULT_ROUNDING - 1));
++ size = 4096 - extra;
++ }
++
++ h->chunkfun = (struct _obstack_chunk * (*)(void *,long)) chunkfun;
++ h->freefun = (void (*) (void *, struct _obstack_chunk *)) freefun;
++ h->chunk_size = size;
++ h->alignment_mask = alignment - 1;
++ h->extra_arg = arg;
++ h->use_extra_arg = 1;
++
++ chunk = h->chunk = CALL_CHUNKFUN (h, h -> chunk_size);
++ if (!chunk)
++ (*obstack_alloc_failed_handler) ();
++ h->next_free = h->object_base = chunk->contents;
++ h->chunk_limit = chunk->limit
++ = (char *) chunk + h->chunk_size;
++ chunk->prev = 0;
++ /* The initial chunk now contains no empty object. */
++ h->maybe_empty_object = 0;
++ h->alloc_failed = 0;
++ return 1;
++}
++
++/* Allocate a new current chunk for the obstack *H
++ on the assumption that LENGTH bytes need to be added
++ to the current object, or a new object of length LENGTH allocated.
++ Copies any partial object from the end of the old chunk
++ to the beginning of the new one. */
++
++void
++_obstack_newchunk (struct obstack *h, int length)
++{
++ register struct _obstack_chunk *old_chunk = h->chunk;
++ register struct _obstack_chunk *new_chunk;
++ register long new_size;
++ register long obj_size = h->next_free - h->object_base;
++ register long i;
++ long already;
++
++ /* Compute size for new chunk. */
++ new_size = (obj_size + length) + (obj_size >> 3) + 100;
++ if (new_size < h->chunk_size)
++ new_size = h->chunk_size;
++
++ /* Allocate and initialize the new chunk. */
++ new_chunk = CALL_CHUNKFUN (h, new_size);
++ if (!new_chunk)
++ (*obstack_alloc_failed_handler) ();
++ h->chunk = new_chunk;
++ new_chunk->prev = old_chunk;
++ new_chunk->limit = h->chunk_limit = (char *) new_chunk + new_size;
++
++ /* Move the existing object to the new chunk.
++ Word at a time is fast and is safe if the object
++ is sufficiently aligned. */
++ if (h->alignment_mask + 1 >= DEFAULT_ALIGNMENT)
++ {
++ for (i = obj_size / sizeof (COPYING_UNIT) - 1;
++ i >= 0; i--)
++ ((COPYING_UNIT *)new_chunk->contents)[i]
++ = ((COPYING_UNIT *)h->object_base)[i];
++ /* We used to copy the odd few remaining bytes as one extra COPYING_UNIT,
++ but that can cross a page boundary on a machine
++ which does not do strict alignment for COPYING_UNITS. */
++ already = obj_size / sizeof (COPYING_UNIT) * sizeof (COPYING_UNIT);
++ }
++ else
++ already = 0;
++ /* Copy remaining bytes one by one. */
++ for (i = already; i < obj_size; i++)
++ new_chunk->contents[i] = h->object_base[i];
++
++ /* If the object just copied was the only data in OLD_CHUNK,
++ free that chunk and remove it from the chain.
++ But not if that chunk might contain an empty object. */
++ if (h->object_base == old_chunk->contents && ! h->maybe_empty_object)
++ {
++ new_chunk->prev = old_chunk->prev;
++ CALL_FREEFUN (h, old_chunk);
++ }
++
++ h->object_base = new_chunk->contents;
++ h->next_free = h->object_base + obj_size;
++ /* The new chunk certainly contains no empty object yet. */
++ h->maybe_empty_object = 0;
++}
++
++/* Return nonzero if object OBJ has been allocated from obstack H.
++ This is here for debugging.
++ If you use it in a program, you are probably losing. */
++
++/* Suppress -Wmissing-prototypes warning. We don't want to declare this in
++ obstack.h because it is just for debugging. */
++int _obstack_allocated_p (struct obstack *h, POINTER obj);
++
++int
++_obstack_allocated_p (struct obstack *h, POINTER obj)
++{
++ register struct _obstack_chunk *lp; /* below addr of any objects in this chunk */
++ register struct _obstack_chunk *plp; /* point to previous chunk if any */
++
++ lp = (h)->chunk;
++ /* We use >= rather than > since the object cannot be exactly at
++ the beginning of the chunk but might be an empty object exactly
++ at the end of an adjacent chunk. */
++ while (lp != 0 && ((POINTER) lp >= obj || (POINTER) (lp)->limit < obj))
++ {
++ plp = lp->prev;
++ lp = plp;
++ }
++ return lp != 0;
++}
++
++/* Free objects in obstack H, including OBJ and everything allocate
++ more recently than OBJ. If OBJ is zero, free everything in H. */
++
++#undef obstack_free
++
++/* This function has two names with identical definitions.
++ This is the first one, called from non-ANSI code. */
++
++void
++_obstack_free (struct obstack *h, POINTER obj)
++{
++ register struct _obstack_chunk *lp; /* below addr of any objects in this chunk */
++ register struct _obstack_chunk *plp; /* point to previous chunk if any */
++
++ lp = h->chunk;
++ /* We use >= because there cannot be an object at the beginning of a chunk.
++ But there can be an empty object at that address
++ at the end of another chunk. */
++ while (lp != 0 && ((POINTER) lp >= obj || (POINTER) (lp)->limit < obj))
++ {
++ plp = lp->prev;
++ CALL_FREEFUN (h, lp);
++ lp = plp;
++ /* If we switch chunks, we can't tell whether the new current
++ chunk contains an empty object, so assume that it may. */
++ h->maybe_empty_object = 1;
++ }
++ if (lp)
++ {
++ h->object_base = h->next_free = (char *) (obj);
++ h->chunk_limit = lp->limit;
++ h->chunk = lp;
++ }
++ else if (obj != 0)
++ /* obj is not in any of the chunks! */
++ abort ();
++}
++
++/* This function is used from ANSI code. */
++
++void
++obstack_free (struct obstack *h, POINTER obj)
++{
++ register struct _obstack_chunk *lp; /* below addr of any objects in this chunk */
++ register struct _obstack_chunk *plp; /* point to previous chunk if any */
++
++ lp = h->chunk;
++ /* We use >= because there cannot be an object at the beginning of a chunk.
++ But there can be an empty object at that address
++ at the end of another chunk. */
++ while (lp != 0 && ((POINTER) lp >= obj || (POINTER) (lp)->limit < obj))
++ {
++ plp = lp->prev;
++ CALL_FREEFUN (h, lp);
++ lp = plp;
++ /* If we switch chunks, we can't tell whether the new current
++ chunk contains an empty object, so assume that it may. */
++ h->maybe_empty_object = 1;
++ }
++ if (lp)
++ {
++ h->object_base = h->next_free = (char *) (obj);
++ h->chunk_limit = lp->limit;
++ h->chunk = lp;
++ }
++ else if (obj != 0)
++ /* obj is not in any of the chunks! */
++ abort ();
++}
++
++int
++_obstack_memory_used (struct obstack *h)
++{
++ register struct _obstack_chunk* lp;
++ register int nbytes = 0;
++
++ for (lp = h->chunk; lp != 0; lp = lp->prev)
++ {
++ nbytes += lp->limit - (char *) lp;
++ }
++ return nbytes;
++}
++
++/* Define the error handler. */
++#ifndef _
++# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
++# include <libintl.h>
++# ifndef _
++# define _(Str) gettext (Str)
++# endif
++# else
++# define _(Str) (Str)
++# endif
++#endif
++
++static void
++print_and_abort (void)
++{
++ fputs (_("memory exhausted\n"), stderr);
++ exit (obstack_exit_failure);
++}
++
++#if 0
++/* These are now turned off because the applications do not use it
++ and it uses bcopy via obstack_grow, which causes trouble on sysV. */
++
++/* Now define the functional versions of the obstack macros.
++ Define them to simply use the corresponding macros to do the job. */
++
++/* The function names appear in parentheses in order to prevent
++ the macro-definitions of the names from being expanded there. */
++
++POINTER (obstack_base) (struct obstack *obstack)
++{
++ return obstack_base (obstack);
++}
++
++POINTER (obstack_next_free) (struct obstack *obstack)
++{
++ return obstack_next_free (obstack);
++}
++
++int (obstack_object_size) (struct obstack *obstack)
++{
++ return obstack_object_size (obstack);
++}
++
++int (obstack_room) (struct obstack *obstack)
++{
++ return obstack_room (obstack);
++}
++
++int (obstack_make_room) (struct obstack *obstack, int length)
++{
++ return obstack_make_room (obstack, length);
++}
++
++void (obstack_grow) (struct obstack *obstack, POINTER pointer, int length)
++{
++ obstack_grow (obstack, pointer, length);
++}
++
++void (obstack_grow0) (struct obstack *obstack, POINTER pointer, int length)
++{
++ obstack_grow0 (obstack, pointer, length);
++}
++
++void (obstack_1grow) (struct obstack *obstack, int character)
++{
++ obstack_1grow (obstack, character);
++}
++
++void (obstack_blank) (struct obstack *obstack, int length)
++{
++ obstack_blank (obstack, length);
++}
++
++void (obstack_1grow_fast) (struct obstack *obstack, int character)
++{
++ obstack_1grow_fast (obstack, character);
++}
++
++void (obstack_blank_fast) (struct obstack *obstack, int length)
++{
++ obstack_blank_fast (obstack, length);
++}
++
++POINTER (obstack_finish) (struct obstack *obstack)
++{
++ return obstack_finish (obstack);
++}
++
++POINTER (obstack_alloc) (struct obstack *obstack, int length)
++{
++ return obstack_alloc (obstack, length);
++}
++
++POINTER (obstack_copy) (struct obstack *obstack, POINTER pointer, int length)
++{
++ return obstack_copy (obstack, pointer, length);
++}
++
++POINTER (obstack_copy0) (struct obstack *obstack, POINTER pointer, int length)
++{
++ return obstack_copy0 (obstack, pointer, length);
++}
++
++#endif /* 0 */
++
++#endif /* !ELIDE_CODE */
Added: head/devel/dwz/files/patch-obstack.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/dwz/files/patch-obstack.h Thu Feb 18 19:44:39 2021 (r565971)
@@ -0,0 +1,550 @@
+--- obstack.h.orig 2020-04-05 14:12:16.193157000 -0400
++++ obstack.h 2020-04-05 14:12:16.233805000 -0400
+@@ -0,0 +1,547 @@
++/* obstack.h - object stack macros
++ Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998,
++ 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
++ Free Software Foundation, Inc.
++
++
++ NOTE: The canonical source of this file is maintained with the GNU C Library.
++ Bugs can be reported to bug-glibc at gnu.org.
++
++ This program is free software; you can redistribute it and/or modify it
++ under the terms of the GNU General Public License as published by the
++ Free Software Foundation; either version 2, or (at your option) any
++ later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
++ USA. */
++
++/* Summary:
++
++All the apparent functions defined here are macros. The idea
++is that you would use these pre-tested macros to solve a
++very specific set of problems, and they would run fast.
++Caution: no side-effects in arguments please!! They may be
++evaluated MANY times!!
++
++These macros operate a stack of objects. Each object starts life
++small, and may grow to maturity. (Consider building a word syllable
++by syllable.) An object can move while it is growing. Once it has
++been "finished" it never changes address again. So the "top of the
++stack" is typically an immature growing object, while the rest of the
++stack is of mature, fixed size and fixed address objects.
++
++These routines grab large chunks of memory, using a function you
++supply, called `obstack_chunk_alloc'. On occasion, they free chunks,
++by calling `obstack_chunk_free'. You must define them and declare
++them before using any obstack macros.
++
++Each independent stack is represented by a `struct obstack'.
++Each of the obstack macros expects a pointer to such a structure
++as the first argument.
++
++One motivation for this package is the problem of growing char strings
++in symbol tables. Unless you are "fascist pig with a read-only mind"
++--Gosper's immortal quote from HAKMEM item 154, out of context--you
++would not like to put any arbitrary upper limit on the length of your
++symbols.
++
++In practice this often means you will build many short symbols and a
++few long symbols. At the time you are reading a symbol you don't know
++how long it is. One traditional method is to read a symbol into a
++buffer, realloc()ating the buffer every time you try to read a symbol
++that is longer than the buffer. This is beaut, but you still will
++want to copy the symbol from the buffer to a more permanent
++symbol-table entry say about half the time.
++
++With obstacks, you can work differently. Use one obstack for all symbol
++names. As you read a symbol, grow the name in the obstack gradually.
++When the name is complete, finalize it. Then, if the symbol exists already,
++free the newly read name.
++
++The way we do this is to take a large chunk, allocating memory from
++low addresses. When you want to build a symbol in the chunk you just
++add chars above the current "high water mark" in the chunk. When you
++have finished adding chars, because you got to the end of the symbol,
++you know how long the chars are, and you can create a new object.
++Mostly the chars will not burst over the highest address of the chunk,
++because you would typically expect a chunk to be (say) 100 times as
++long as an average object.
++
++In case that isn't clear, when we have enough chars to make up
++the object, THEY ARE ALREADY CONTIGUOUS IN THE CHUNK (guaranteed)
++so we just point to it where it lies. No moving of chars is
++needed and this is the second win: potentially long strings need
++never be explicitly shuffled. Once an object is formed, it does not
++change its address during its lifetime.
++
++When the chars burst over a chunk boundary, we allocate a larger
++chunk, and then copy the partly formed object from the end of the old
++chunk to the beginning of the new larger chunk. We then carry on
++accreting characters to the end of the object as we normally would.
++
++A special macro is provided to add a single char at a time to a
++growing object. This allows the use of register variables, which
++break the ordinary 'growth' macro.
++
++Summary:
++ We allocate large chunks.
++ We carve out one object at a time from the current chunk.
++ Once carved, an object never moves.
++ We are free to append data of any size to the currently
++ growing object.
++ Exactly one object is growing in an obstack at any one time.
++ You can run one obstack per control block.
++ You may have as many control blocks as you dare.
++ Because of the way we do it, you can `unwind' an obstack
++ back to a previous state. (You may remove objects much
++ as you would with a stack.)
++*/
++
++
++/* Don't do the contents of this file more than once. */
++
++#ifndef _OBSTACK_H
++#define _OBSTACK_H 1
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/* We use subtraction of (char *) 0 instead of casting to int
++ because on word-addressable machines a simple cast to int
++ may ignore the byte-within-word field of the pointer. */
++
++#ifndef __PTR_TO_INT
++# define __PTR_TO_INT(P) ((P) - (char *) 0)
++#endif
++
++#ifndef __INT_TO_PTR
++# define __INT_TO_PTR(P) ((P) + (char *) 0)
++#endif
++
++/* We need the type of the resulting object. If __PTRDIFF_TYPE__ is
++ defined, as with GNU C, use that; that way we don't pollute the
++ namespace with <stddef.h>'s symbols. Otherwise, if <stddef.h> is
++ available, include it and use ptrdiff_t. In traditional C, long is
++ the best that we can do. */
++
++#ifdef __PTRDIFF_TYPE__
++# define PTR_INT_TYPE __PTRDIFF_TYPE__
++#else
++# ifdef HAVE_STDDEF_H
++# include <stddef.h>
++# define PTR_INT_TYPE ptrdiff_t
++# else
++# define PTR_INT_TYPE long
++# endif
++#endif
++
++#if defined _LIBC || defined HAVE_STRING_H
++# include <string.h>
++# define _obstack_memcpy(To, From, N) memcpy ((To), (From), (N))
++#else
++# ifdef memcpy
++# define _obstack_memcpy(To, From, N) memcpy ((To), (char *)(From), (N))
++# else
++# define _obstack_memcpy(To, From, N) bcopy ((char *)(From), (To), (N))
++# endif
++#endif
++
++struct _obstack_chunk /* Lives at front of each chunk. */
++{
++ char *limit; /* 1 past end of this chunk */
++ struct _obstack_chunk *prev; /* address of prior chunk or NULL */
++ char contents[4]; /* objects begin here */
++};
++
++struct obstack /* control current object in current chunk */
++{
++ long chunk_size; /* preferred size to allocate chunks in */
++ struct _obstack_chunk *chunk; /* address of current struct obstack_chunk */
++ char *object_base; /* address of object we are building */
++ char *next_free; /* where to add next char to current object */
++ char *chunk_limit; /* address of char after current chunk */
++ PTR_INT_TYPE temp; /* Temporary for some macros. */
++ int alignment_mask; /* Mask of alignment for each object. */
++ /* These prototypes vary based on `use_extra_arg', and we use
++ casts to the prototypeless function type in all assignments,
++ but having prototypes here quiets -Wstrict-prototypes. */
++ struct _obstack_chunk *(*chunkfun) (void *, long);
++ void (*freefun) (void *, struct _obstack_chunk *);
++ void *extra_arg; /* first arg for chunk alloc/dealloc funcs */
++ unsigned use_extra_arg:1; /* chunk alloc/dealloc funcs take extra arg */
++ unsigned maybe_empty_object:1;/* There is a possibility that the current
++ chunk contains a zero-length object. This
++ prevents freeing the chunk if we allocate
++ a bigger chunk to replace it. */
++ unsigned alloc_failed:1; /* No longer used, as we now call the failed
++ handler on error, but retained for binary
++ compatibility. */
++};
++
++/* Declare the external functions we use; they are in obstack.c. */
++
++extern void _obstack_newchunk (struct obstack *, int);
++extern void _obstack_free (struct obstack *, void *);
++extern int _obstack_begin (struct obstack *, int, int,
++ void *(*) (long), void (*) (void *));
++extern int _obstack_begin_1 (struct obstack *, int, int,
++ void *(*) (void *, long),
++ void (*) (void *, void *), void *);
++extern int _obstack_memory_used (struct obstack *);
++
++/* Do the function-declarations after the structs
++ but before defining the macros. */
++
++void obstack_init (struct obstack *obstack);
++
++void * obstack_alloc (struct obstack *obstack, int size);
++
++void * obstack_copy (struct obstack *obstack, void *address, int size);
++void * obstack_copy0 (struct obstack *obstack, void *address, int size);
++
++void obstack_free (struct obstack *obstack, void *block);
++
++void obstack_blank (struct obstack *obstack, int size);
++
++void obstack_grow (struct obstack *obstack, void *data, int size);
++void obstack_grow0 (struct obstack *obstack, void *data, int size);
++
++void obstack_1grow (struct obstack *obstack, int data_char);
++void obstack_ptr_grow (struct obstack *obstack, void *data);
++void obstack_int_grow (struct obstack *obstack, int data);
++
++void * obstack_finish (struct obstack *obstack);
++
++int obstack_object_size (struct obstack *obstack);
++
++int obstack_room (struct obstack *obstack);
++void obstack_make_room (struct obstack *obstack, int size);
++void obstack_1grow_fast (struct obstack *obstack, int data_char);
++void obstack_ptr_grow_fast (struct obstack *obstack, void *data);
++void obstack_int_grow_fast (struct obstack *obstack, int data);
++void obstack_blank_fast (struct obstack *obstack, int size);
++
++void * obstack_base (struct obstack *obstack);
++void * obstack_next_free (struct obstack *obstack);
++int obstack_alignment_mask (struct obstack *obstack);
++int obstack_chunk_size (struct obstack *obstack);
++int obstack_memory_used (struct obstack *obstack);
++
++int obstack_printf(struct obstack *obstack, const char *__restrict fmt, ...);
++
++/* Error handler called when `obstack_chunk_alloc' failed to allocate
++ more memory. This can be set to a user defined function. The
++ default action is to print a message and abort. */
++extern void (*obstack_alloc_failed_handler) (void);
++
++/* Exit value used when `print_and_abort' is used. */
++extern int obstack_exit_failure;
++
++/* Pointer to beginning of object being allocated or to be allocated next.
++ Note that this might not be the final address of the object
++ because a new chunk might be needed to hold the final size. */
++
++#define obstack_base(h) ((h)->object_base)
++
++/* Size for allocating ordinary chunks. */
++
++#define obstack_chunk_size(h) ((h)->chunk_size)
++
++/* Pointer to next byte not yet allocated in current chunk. */
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list