Re: gas .align limit

Now that rs_align_code has been corrected for all targets, put the
.align limit back to bits_per_address-1.  Also fix a comment.

	* frags.h (fr_var): Correct comment.
	* read.c (TC_ALIGN_LIMIT): Revert commit ff4c03516c change.

diff --git a/gas/frags.h b/gas/frags.h
index 695277d7871c8d75b279f7ab7f49d83588f81b01..c2fea09a8f6e6661873141f724101ef19242b05c 100644 (file)
--- a/gas/frags.h
+++ b/gas/frags.h
@@ -44,8 +44,7 @@ struct frag {
 
   /* (Fixed) number of octets we know we have.  May be 0.  */
   valueT fr_fix;
-  /* May be used for (Variable) number of octets after above.
-     The generic frag handling code no longer makes any use of fr_var.  */
+  /* May be used for (Variable) number of octets after above.  */
   offsetT fr_var;
   /* For variable-length tail.  */
   offsetT fr_offset;

diff --git a/gas/read.c b/gas/read.c
index eaa1300ff966b0403f89863abb91c0a0d9f8af07..de26d4b646088ffe22356760f4d3fc5b9e44c996 100644 (file)
--- a/gas/read.c
+++ b/gas/read.c
@@ -1514,12 +1514,7 @@ s_abort (int ignore ATTRIBUTE_UNUSED)
 }
 
 #ifndef TC_ALIGN_LIMIT
-/* Limit alignment in code to 1G, to limit the amount of memory used
-   by rs_code_align frags.  */
-#define TC_ALIGN_LIMIT \
-  ((subseg_text_p (now_seg)                            \
-    && stdoutput->arch_info->bits_per_address >= 32)   \
-   ? 30 : stdoutput->arch_info->bits_per_address - 1)
+#define TC_ALIGN_LIMIT (stdoutput->arch_info->bits_per_address - 1)
 #endif
 
 /* Handle the .align pseudo-op.  A positive ARG is a default alignment