Author: emaste
Date: Mon Dec 1 16:07:31 2014
New Revision: 275369
URL: https://svnweb.freebsd.org/changeset/base/275369
Log:
Fix elftoolchain tools in-tree build
* make variables static
* add header for uint*_t typedefs
Modified:
head/contrib/elftoolchain/elfcopy/ascii.c
head/contrib/elftoolchain/elfcopy/segments.c
head/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c
head/contrib/elftoolchain/nm/nm.c
head/contrib/elftoolchain/strings/strings.c
Modified: head/contrib/elftoolchain/elfcopy/ascii.c
==============================================================================
--- head/contrib/elftoolchain/elfcopy/ascii.c Mon Dec 1 15:21:54 2014
(r275368)
+++ head/contrib/elftoolchain/elfcopy/ascii.c Mon Dec 1 16:07:31 2014
(r275369)
@@ -29,6 +29,7 @@
#include <ctype.h>
#include <err.h>
#include <gelf.h>
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Modified: head/contrib/elftoolchain/elfcopy/segments.c
==============================================================================
--- head/contrib/elftoolchain/elfcopy/segments.c Mon Dec 1 15:21:54
2014 (r275368)
+++ head/contrib/elftoolchain/elfcopy/segments.c Mon Dec 1 16:07:31
2014 (r275369)
@@ -28,6 +28,7 @@
#include <sys/queue.h>
#include <err.h>
#include <gelf.h>
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Modified: head/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c
==============================================================================
--- head/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c Mon Dec 1
15:21:54 2014 (r275368)
+++ head/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c Mon Dec 1
16:07:31 2014 (r275369)
@@ -156,7 +156,7 @@ static int vector_type_qualifier_init(st
static int vector_type_qualifier_push(struct vector_type_qualifier *,
enum type_qualifier);
-int cpp_demangle_gnu3_push_head;
+static int cpp_demangle_gnu3_push_head;
/**
* @brief Decode the input string by IA-64 C++ ABI style.
Modified: head/contrib/elftoolchain/nm/nm.c
==============================================================================
--- head/contrib/elftoolchain/nm/nm.c Mon Dec 1 15:21:54 2014
(r275368)
+++ head/contrib/elftoolchain/nm/nm.c Mon Dec 1 16:07:31 2014
(r275369)
@@ -65,7 +65,7 @@ typedef void (*fn_sym_print)(const GElf_
typedef int (*fn_filter)(char, const GElf_Sym *, const char *);
/* output filter list */
-SLIST_HEAD(filter_head, filter_entry) nm_out_filter =
+static SLIST_HEAD(filter_head, filter_entry) nm_out_filter =
SLIST_HEAD_INITIALIZER(nm_out_filter);
struct filter_entry {
Modified: head/contrib/elftoolchain/strings/strings.c
==============================================================================
--- head/contrib/elftoolchain/strings/strings.c Mon Dec 1 15:21:54 2014
(r275368)
+++ head/contrib/elftoolchain/strings/strings.c Mon Dec 1 16:07:31 2014
(r275369)
@@ -75,9 +75,9 @@ enum encoding_style {
(encoding == ENCODING_8BIT && (c) > 127)))
-int encoding_size, entire_file, min_len, show_filename, show_loc;
-enum encoding_style encoding;
-enum radix_style radix;
+static int encoding_size, entire_file, min_len, show_filename, show_loc;
+static enum encoding_style encoding;
+static enum radix_style radix;
static struct option strings_longopts[] = {
{ "all", no_argument, NULL, 'a'},
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
