aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrevor Saunders <tbsaunde+binutils@tbsaunde.org>2016-02-28 18:00:00 -0500
committerTrevor Saunders <tbsaunde+binutils@tbsaunde.org>2016-03-22 19:08:50 -0400
commit0a433ebc90ae1d3d86382757aa049a0e91bd5019 (patch)
tree107918aa861f6f7cc37e87c4c480db1c225fd048
parent8860a416a2357aa66a03218c6076b95ef8052ccf (diff)
downloadgdb-0a433ebc90ae1d3d86382757aa049a0e91bd5019.zip
gdb-0a433ebc90ae1d3d86382757aa049a0e91bd5019.tar.gz
gdb-0a433ebc90ae1d3d86382757aa049a0e91bd5019.tar.bz2
use do_align () directly in tc-ia64.c
gas/ChangeLog: 2016-03-22 Trevor Saunders <tbsaunde+binutils@tbsaunde.org> * config/tc-ia64.c (ia64_do_align): Remove. (ia64_cons_align): Call do_align () directly. (dot_proc): Likewise. (stmt_float_cons): Likewise.
-rw-r--r--gas/ChangeLog7
-rw-r--r--gas/config/tc-ia64.c29
2 files changed, 17 insertions, 19 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4aa1292..0c5d973 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,12 @@
2016-03-22 Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
+ * config/tc-ia64.c (ia64_do_align): Remove.
+ (ia64_cons_align): Call do_align () directly.
+ (dot_proc): Likewise.
+ (stmt_float_cons): Likewise.
+
+2016-03-22 Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
+
* listing.c (listing_message): Use XNEW style allocation macros.
* read.c (read_a_source_file): Likewise.
(read_symbol_name): Likewise.
diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
index c2f7372..edb2683 100644
--- a/gas/config/tc-ia64.c
+++ b/gas/config/tc-ia64.c
@@ -1025,25 +1025,16 @@ ia64_flush_insns (void)
as_bad (_("qualifying predicate not followed by instruction"));
}
-static void
-ia64_do_align (int nbytes)
-{
- char *saved_input_line_pointer = input_line_pointer;
-
- input_line_pointer = "";
- s_align_bytes (nbytes);
- input_line_pointer = saved_input_line_pointer;
-}
-
void
ia64_cons_align (int nbytes)
{
if (md.auto_align)
{
- char *saved_input_line_pointer = input_line_pointer;
- input_line_pointer = "";
- s_align_bytes (nbytes);
- input_line_pointer = saved_input_line_pointer;
+ int log;
+ for (log = 0; (nbytes & 1) != 1; nbytes >>= 1)
+ log++;
+
+ do_align (log, NULL, 0, 0);
}
}
@@ -4290,7 +4281,7 @@ dot_proc (int dummy ATTRIBUTE_UNUSED)
}
last_pending->next = NULL;
demand_empty_rest_of_line ();
- ia64_do_align (16);
+ do_align (4, NULL, 0, 0);
unwind.prologue = 0;
unwind.prologue_count = 0;
@@ -4843,20 +4834,20 @@ stmt_float_cons (int kind)
switch (kind)
{
case 'd':
- alignment = 8;
+ alignment = 3;
break;
case 'x':
case 'X':
- alignment = 16;
+ alignment = 4;
break;
case 'f':
default:
- alignment = 4;
+ alignment = 2;
break;
}
- ia64_do_align (alignment);
+ do_align (alignment, NULL, 0, 0);
float_cons (kind);
}