aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog5
-rw-r--r--gas/config/tc-mips.c14
2 files changed, 6 insertions, 13 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 69cfa2c..982afbc 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,10 @@
Tue Dec 17 10:59:32 1996 Ian Lance Taylor <ian@cygnus.com>
+ * config/tc-mips.c: Undo part of last Friday's alignment changes.
+ (md_begin): Always align the text section to a four byte
+ boundary.
+ (append_insn): Remove call to record_align.
+
* config/tc-mips.c (insn_label): Remove.
(struct insn_label_list): Define.
(insn_labels, free_insn_labels): New static variables.
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 79863cd..d90c7e6 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -923,8 +923,7 @@ md_begin ()
mips_cprmask[3] = 0;
/* set the default alignment for the text section (2**2) */
- if (OUTPUT_FLAVOR != bfd_target_elf_flavour)
- record_alignment (text_section, 2);
+ record_alignment (text_section, 2);
if (USE_GLOBAL_POINTER_OPT)
bfd_set_gp_size (stdoutput, g_switch_value);
@@ -1182,17 +1181,6 @@ append_insn (place, ip, address_expr, reloc_type, unmatched_hi)
fixS *fixp;
int nops = 0;
- /* Make sure the section will be aligned appropriately. Note that
- we do not insert an alignment directive; it remains the user's
- responsibility to align instructions if necessary. Here we only
- ensure that the section will have the right default alignment, so
- that the right thing will happen if no alignment directive is
- used. */
- if (mips16)
- record_alignment (now_seg, 1);
- else
- record_alignment (now_seg, 2);
-
/* Mark instruction labels in mips16 mode. This permits the linker
to handle them specially, such as generating jalx instructions
when needed. We also make them odd for the duration of the