This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH] simplify tic54x_set_default_include ()
- From: tbsaunde+binutils at tbsaunde dot org
- To: binutils at sourceware dot org
- Cc: Trevor Saunders <tbsaunde+binutils at tbsaunde dot org>
- Date: Sun, 5 Jun 2016 23:17:25 -0400
- Subject: [PATCH] simplify tic54x_set_default_include ()
- Authentication-results: sourceware.org; auth=none
From: Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
Hi,
its only called with an argument of 0, so we might as well remove the code
supporting other values.
built and regtested tic54x-coff, ok?
Thanks!
Trev
gas/ChangeLog:
2016-06-05 Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
* config/tc-tic54x.c (tic54x_set_default_include): remove argument
and simplify accordingly.
(tic54x_include): Adjust.
(tic54x_mlib): Likewise.
---
gas/config/tc-tic54x.c | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/gas/config/tc-tic54x.c b/gas/config/tc-tic54x.c
index 947ba73..409e4a0 100644
--- a/gas/config/tc-tic54x.c
+++ b/gas/config/tc-tic54x.c
@@ -1855,20 +1855,15 @@ tic54x_clink (int ignored ATTRIBUTE_UNUSED)
set to "." instead. */
static void
-tic54x_set_default_include (int dot)
+tic54x_set_default_include (void)
{
- const char *dir = ".";
- char *tmp = NULL;
+ char *dir, *tmp = NULL;
+ const char *curfile;
+ unsigned lineno;
- if (!dot)
- {
- const char *curfile;
- unsigned lineno;
-
- curfile = as_where (&lineno);
- dir = xstrdup (curfile);
- tmp = strrchr (dir, '/');
- }
+ curfile = as_where (&lineno);
+ dir = xstrdup (curfile);
+ tmp = strrchr (dir, '/');
if (tmp != NULL)
{
int len;
@@ -1936,7 +1931,7 @@ tic54x_include (int ignored ATTRIBUTE_UNUSED)
tic54x_clear_local_labels (0);
- tic54x_set_default_include (0);
+ tic54x_set_default_include ();
s_include (0);
}
@@ -2293,7 +2288,7 @@ tic54x_mlib (int ignore ATTRIBUTE_UNUSED)
}
demand_empty_rest_of_line ();
- tic54x_set_default_include (0);
+ tic54x_set_default_include ();
path = XNEWVEC (char, (unsigned long) len + include_dir_maxlen + 5);
for (i = 0; i < include_dir_count; i++)
--
2.7.4