From 4b92e38839652e05e7cdc86487dd18c3a2048339 Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Sun, 5 Jun 2016 22:25:21 -0400 Subject: [PATCH] simplify tic54x_set_default_include () its only called with an argument of 0, so we might as well remove the code supporting other values. gas/ChangeLog: 2016-06-25 Trevor Saunders * config/tc-tic54x.c (tic54x_set_default_include): remove argument and simplify accordingly. (tic54x_include): Adjust. (tic54x_mlib): Likewise. --- gas/ChangeLog | 7 +++++++ gas/config/tc-tic54x.c | 23 +++++++++-------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index d7246f824c..91299abfb0 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,10 @@ +2016-06-25 Trevor Saunders + + * config/tc-tic54x.c (tic54x_set_default_include): remove argument + and simplify accordingly. + (tic54x_include): Adjust. + (tic54x_mlib): Likewise. + 2016-06-25 Trevor Saunders * config/tc-xtensa.c (xtensa_make_property_section): Remove prototype. diff --git a/gas/config/tc-tic54x.c b/gas/config/tc-tic54x.c index 947ba7327f..409e4a010e 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.34.1