These changes clean things up a bit, and improve Solaris cross

[binutils.git] / gas / read.c

diff --git a/gas/read.c b/gas/read.c
index 77398dff1383efb93ab1800708f8236f080f6cda..0a722e36d39d331a7ae561bc2c2c47c85ff8c7b6 100644 (file)
--- a/gas/read.c
+++ b/gas/read.c
@@ -805,7 +805,7 @@ void s_fill() {
         */
 #define BSD_FILL_SIZE_CROCK_8 (8)
        if (temp_size > BSD_FILL_SIZE_CROCK_8) {
-               as_bad(".fill size clamped to %d.", BSD_FILL_SIZE_CROCK_8);
+               as_warn(".fill size clamped to %d.", BSD_FILL_SIZE_CROCK_8);
                temp_size = BSD_FILL_SIZE_CROCK_8 ;
        } if (temp_size < 0) {
                as_warn("Size negative: .fill ignored.");
@@ -814,7 +814,7 @@ void s_fill() {
                as_warn("Repeat < 0, .fill ignored");
                temp_size = 0;
        }
-       temp_fill = get_absolute_expression ();
+
        if (temp_size && !need_pass_2) {
                p = frag_var(rs_fill, (int)temp_size, (int)temp_size, (relax_substateT)0, (symbolS *)0, temp_repeat, (char *)0);
                bzero (p, (int)temp_size);
@@ -1256,7 +1256,9 @@ void s_set() {
        demand_empty_rest_of_line();
 } /* s_set() */
 
-void s_space() {
+void s_space(mult) 
+int mult;
+{
        long temp_repeat;
        register long temp_fill;
        register char *p;
@@ -1268,6 +1270,10 @@ void s_space() {
                input_line_pointer --; /* Backup over what was not a ','. */
                temp_fill = 0;
        }
+       if(mult) 
+       {
+         temp_fill *= mult;
+       }
        if (temp_repeat <= 0) {
                as_warn("Repeat < 0, .space ignored");
                ignore_rest_of_line();