13 files changed, 0 insertions, 287 deletions
diff --git a/devel/dwarves/files/patch-CMakeLists.txt b/devel/dwarves/files/patch-CMakeLists.txt
deleted file mode 100644
index 2e7dde2fc181..000000000000
--- a/devel/dwarves/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,66 +0,0 @@
---- CMakeLists.txt.orig	2016-06-30 19:30:28 UTC
-+++ CMakeLists.txt
-@@ -31,11 +31,14 @@ add_definitions(-D_GNU_SOURCE -DDWARVES_
- find_package(DWARF REQUIRED)
- find_package(ZLIB REQUIRED)
- 
--_set_fancy(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${__LIB}" "libdir")
-+# For argp-standalone
-+find_library(ARGP argp ${LOCALBASE}/lib)
-+
-+_set_fancy(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/lib${__LIB}" "libdir")
- 
- set(dwarves_LIB_SRCS dwarves.c dwarves_fprintf.c gobuffer strings
- 		     ctf_encoder.c ctf_loader.c libctf.c dwarf_loader.c
--		     dutil.c elf_symtab.c rbtree.c)
-+		     dutil.c elf_symtab.c rbtree.c obstack.c)
- add_library(dwarves SHARED ${dwarves_LIB_SRCS})
- set_target_properties(dwarves PROPERTIES VERSION 1.0.0 SOVERSION 1)
- set_target_properties(dwarves PROPERTIES INTERFACE_LINK_LIBRARIES "")
-@@ -53,11 +56,11 @@ target_link_libraries(dwarves_reorganize
- 
- set(codiff_SRCS codiff.c)
- add_executable(codiff ${codiff_SRCS})
--target_link_libraries(codiff dwarves)
-+target_link_libraries(codiff dwarves ${ARGP})
- 
- set(ctracer_SRCS ctracer.c)
- add_executable(ctracer ${ctracer_SRCS})
--target_link_libraries(ctracer dwarves dwarves_emit dwarves_reorganize ${ELF_LIBRARY})
-+target_link_libraries(ctracer dwarves dwarves_emit dwarves_reorganize ${ELF_LIBRARY} ${ARGP})
- 
- set(dtagnames_SRCS dtagnames.c)
- add_executable(dtagnames ${dtagnames_SRCS})
-@@ -65,19 +68,19 @@ target_link_libraries(dtagnames dwarves)
- 
- set(pahole_SRCS pahole.c)
- add_executable(pahole ${pahole_SRCS})
--target_link_libraries(pahole dwarves dwarves_reorganize)
-+target_link_libraries(pahole dwarves dwarves_reorganize ${ARGP})
- 
- set(pdwtags_SRCS pdwtags.c)
- add_executable(pdwtags ${pdwtags_SRCS})
--target_link_libraries(pdwtags dwarves)
-+target_link_libraries(pdwtags dwarves ${ARGP})
- 
- set(pglobal_SRCS pglobal.c)
- add_executable(pglobal ${pglobal_SRCS})
--target_link_libraries(pglobal dwarves)
-+target_link_libraries(pglobal dwarves ${ARGP})
- 
- set(pfunct_SRCS pfunct.c )
- add_executable(pfunct ${pfunct_SRCS})
--target_link_libraries(pfunct dwarves dwarves_emit ${ELF_LIBRARY})
-+target_link_libraries(pfunct dwarves dwarves_emit ${ELF_LIBRARY} ${ARGP})
- 
- set(prefcnt_SRCS prefcnt.c)
- add_executable(prefcnt ${prefcnt_SRCS})
-@@ -89,7 +92,7 @@ target_link_libraries(scncopy dwarves ${
- 
- set(syscse_SRCS syscse.c)
- add_executable(syscse ${syscse_SRCS})
--target_link_libraries(syscse dwarves)
-+target_link_libraries(syscse dwarves ${ARGP})
- 
- install(TARGETS codiff ctracer dtagnames pahole pdwtags
- 		pfunct pglobal prefcnt scncopy syscse RUNTIME DESTINATION
diff --git a/devel/dwarves/files/patch-ctf__loader.c b/devel/dwarves/files/patch-ctf__loader.c
deleted file mode 100644
index 00778a231220..000000000000
--- a/devel/dwarves/files/patch-ctf__loader.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- ctf_loader.c.orig	2016-06-30 19:30:28 UTC
-+++ ctf_loader.c
-@@ -11,7 +11,6 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <stddef.h>
--#include <malloc.h>
- #include <string.h>
- #include <limits.h>
- #include <libgen.h>
diff --git a/devel/dwarves/files/patch-dtagnames.c b/devel/dwarves/files/patch-dtagnames.c
deleted file mode 100644
index 51c5df50141d..000000000000
--- a/devel/dwarves/files/patch-dtagnames.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- dtagnames.c.orig	2016-06-30 19:30:28 UTC
-+++ dtagnames.c
-@@ -9,16 +9,33 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
--#include <malloc.h>
-+
-+/* For mallctl */
-+#include <err.h>
-+#include <errno.h>
-+#include <malloc_np.h>
- 
- #include "dwarves.h"
- #include "dutil.h"
- 
- static void print_malloc_stats(void)
- {
-+#if 0
- 	struct mallinfo m = mallinfo();
- 
- 	fprintf(stderr, "size: %u\n", m.uordblks);
-+#else
-+	size_t allocated, olen;
-+	int rc;
-+
-+	olen = sizeof(allocated);
-+	rc = mallctl("stats.allocated", &allocated, &olen, NULL, 0);
-+	if (rc != 0) {
-+		errno = rc;
-+		err(1, "mallctl stats.allocated");
-+	}
-+	fprintf(stderr, "size: %zu\n", allocated);
-+#endif
- }
- 
- static int class__tag_name(struct tag *tag, struct cu *cu __unused,
diff --git a/devel/dwarves/files/patch-dutil.h b/devel/dwarves/files/patch-dutil.h
deleted file mode 100644
index 5b413fe052dc..000000000000
--- a/devel/dwarves/files/patch-dutil.h
+++ /dev/null
@@ -1,30 +0,0 @@
---- dutil.h.orig	2016-06-30 19:30:28 UTC
-+++ dutil.h
-@@ -15,7 +15,17 @@
- #include <stddef.h>
- #include <elf.h>
- #include <gelf.h>
-+#if 0
- #include <asm/bitsperlong.h>
-+#else
-+# if __SIZEOF_LONG__ == 8
-+#  define __BITS_PER_LONG 64
-+# elif __SIZEOF_LONG__ == 4
-+#  define __BITS_PER_LONG 32
-+# else
-+#  error What are you
-+# endif
-+#endif
- #include "rbtree.h"
- 
- #define BITS_PER_LONG __BITS_PER_LONG
-@@ -28,7 +38,9 @@
- #define __pure __attribute__ ((pure))
- #endif
- 
-+#ifndef roundup
- #define roundup(x,y) ((((x) + ((y) - 1)) / (y)) * (y))
-+#endif
- 
- static inline __attribute__((const)) bool is_power_of_2(unsigned long n)
- {
diff --git a/devel/dwarves/files/patch-dwarves.c b/devel/dwarves/files/patch-dwarves.c
deleted file mode 100644
index 5f64a8e51005..000000000000
--- a/devel/dwarves/files/patch-dwarves.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- dwarves.c.orig	2016-06-30 19:30:28 UTC
-+++ dwarves.c
-@@ -16,6 +16,8 @@
- #include <fcntl.h>
- #include <fnmatch.h>
- #include <libelf.h>
-+/* For PATH_MAX */
-+#include <limits.h>
- #include <search.h>
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/devel/dwarves/files/patch-dwarves__fprintf.c b/devel/dwarves/files/patch-dwarves__fprintf.c
deleted file mode 100644
index 6e9285066880..000000000000
--- a/devel/dwarves/files/patch-dwarves__fprintf.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- dwarves_fprintf.c.orig	2016-06-30 19:30:28 UTC
-+++ dwarves_fprintf.c
-@@ -9,6 +9,9 @@
-   published by the Free Software Foundation.
- */
- 
-+/* For CACHE_LINE_SIZE */
-+#include <sys/param.h>
-+
- #include <dwarf.h>
- #include <errno.h>
- #include <stdio.h>
-@@ -1699,7 +1702,14 @@ void cus__print_error_msg(const char *pr
- void dwarves__fprintf_init(uint16_t user_cacheline_size)
- {
- 	if (user_cacheline_size == 0) {
-+#if 0
- 		long sys_cacheline_size = sysconf(_SC_LEVEL1_DCACHE_LINESIZE);
-+#else
-+		/*
-+		 * CEM: Ideally we could get this programmatically.
-+		 */
-+		long sys_cacheline_size = CACHE_LINE_SIZE;
-+#endif
- 
- 		if (sys_cacheline_size > 0)
- 			cacheline_size = sys_cacheline_size;
diff --git a/devel/dwarves/files/patch-elf__symtab.c b/devel/dwarves/files/patch-elf__symtab.c
deleted file mode 100644
index ae7a090678d0..000000000000
--- a/devel/dwarves/files/patch-elf__symtab.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- elf_symtab.c.orig	2016-06-30 19:30:28 UTC
-+++ elf_symtab.c
-@@ -7,8 +7,8 @@
-   published by the Free Software Foundation.
- */
- 
--#include <malloc.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- 
- #include "dutil.h"
diff --git a/devel/dwarves/files/patch-exitfail.h b/devel/dwarves/files/patch-exitfail.h
deleted file mode 100644
index 86a7a4b2ff0f..000000000000
--- a/devel/dwarves/files/patch-exitfail.h
+++ /dev/null
@@ -1,5 +0,0 @@
---- exitfail.h.orig	2016-07-14 06:29:38 UTC
-+++ exitfail.h
-@@ -0,0 +1,2 @@
-+#pragma once
-+#define	exit_failure	EXIT_FAILURE
diff --git a/devel/dwarves/files/patch-libctf.c b/devel/dwarves/files/patch-libctf.c
deleted file mode 100644
index 0434118d4590..000000000000
--- a/devel/dwarves/files/patch-libctf.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libctf.c.orig	2016-06-30 19:30:28 UTC
-+++ libctf.c
-@@ -1,7 +1,8 @@
-+#include <sys/stat.h>
-+
- #include <fcntl.h>
- #include <gelf.h>
- #include <limits.h>
--#include <malloc.h>
- #include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/devel/dwarves/files/patch-pdwtags.c b/devel/dwarves/files/patch-pdwtags.c
deleted file mode 100644
index 78b457831278..000000000000
--- a/devel/dwarves/files/patch-pdwtags.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- pdwtags.c.orig	2016-06-30 19:30:28 UTC
-+++ pdwtags.c
-@@ -9,7 +9,6 @@
- #include <argp.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <malloc.h>
- 
- #include "dwarves.h"
- #include "dutil.h"
diff --git a/devel/dwarves/files/patch-pglobal.c b/devel/dwarves/files/patch-pglobal.c
deleted file mode 100644
index c443daf6827c..000000000000
--- a/devel/dwarves/files/patch-pglobal.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- pglobal.c.orig	2016-06-30 19:30:28 UTC
-+++ pglobal.c
-@@ -8,7 +8,6 @@
-  */
- 
- #include <argp.h>
--#include <malloc.h>
- #include <search.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -92,7 +91,7 @@ static void extvar__add(const struct var
- 		nodep = tsearch(gvar, &tree, extvar__compare);
- 		if (nodep == NULL)
- 			oom("tsearch");
--		else if (*nodep != gvar)
-+		else if (*nodep != gvar) {
- 			if (gvar->var->declaration) {
- 				gvar->next = (*nodep)->next;
- 				(*nodep)->next = gvar;
-@@ -100,6 +99,7 @@ static void extvar__add(const struct var
- 				gvar->next = *nodep;
- 				*nodep = gvar;
- 			}
-+		}
- 	}
- }
- 
-@@ -315,7 +315,10 @@ int main(int argc, char *argv[])
- 		twalk(tree, function_action__walk);
- 	}
- 
-+#if 0
-+	/* Our search.h doesn't implement tdestroy; leak for now. */
- 	tdestroy(tree, free_node);
-+#endif
- 	rc = EXIT_SUCCESS;
- out_cus_delete:
- 	cus__delete(cus);
diff --git a/devel/dwarves/files/patch-prefcnt.c b/devel/dwarves/files/patch-prefcnt.c
deleted file mode 100644
index 0dc76204a97a..000000000000
--- a/devel/dwarves/files/patch-prefcnt.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- prefcnt.c.orig	2016-06-30 19:30:28 UTC
-+++ prefcnt.c
-@@ -66,9 +66,11 @@ static void refcnt_tag(struct tag *tag, 
- 
- 	tag->visited = 1;
- 
--	if (tag__is_struct(tag) || tag__is_union(tag))
--		type__for_each_member(tag__type(tag), member)
-+	if (tag__is_struct(tag) || tag__is_union(tag)) {
-+		type__for_each_member(tag__type(tag), member) {
- 			refcnt_member(member, cu);
-+		}
-+	}
- }
- 
- static void refcnt_lexblock(const struct lexblock *lexblock, const struct cu *cu)
diff --git a/devel/dwarves/files/patch-strings.c b/devel/dwarves/files/patch-strings.c
deleted file mode 100644
index 387ffcaa5a86..000000000000
--- a/devel/dwarves/files/patch-strings.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- strings.c.orig	2016-06-30 19:30:28 UTC
-+++ strings.c
-@@ -39,7 +39,10 @@ void strings__delete(struct strings *str
- {
- 	if (strs == NULL)
- 		return;
-+#if 0
-+	/* Our search.h doesn't implement tdestroy; leak for now. */
- 	tdestroy(strs->tree, do_nothing);
-+#endif
- 	__gobuffer__delete(&strs->gb);
- 	free(strs);
- }