From b53ccaacae4537af9cdc9b037f49f16467f84ea4 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Wed, 9 Sep 1992 18:37:27 +0000
Subject: [PATCH] Wed Sep  9 11:06:25 1992  Ian Lance Taylor  (ian@cygnus.com)

	* Makefile.in: use gas_target instead of modifying target_cpu.
	From Steve Chamberlain:
	Makefile.in: Handle m68*-*-coff*.
	read.c, read.h: add mult argument to s_space
---
 gas/ChangeLog    |  7 +++++++
 gas/configure.in | 36 ++++++++++++++++++++++--------------
 gas/read.c       |  8 +++++++-
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 87f8ca77e55..38ef824a052 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+Wed Sep  9 11:06:25 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in: use gas_target instead of modifying target_cpu.
+	From Steve Chamberlain:
+	Makefile.in: Handle m68*-*-coff*.
+	read.c, read.h: add mult argument to s_space
+
 Tue Sep  8 17:10:58 1992  Ken Raeburn  (raeburn@cambridge.cygnus.com)
 
 	* Makefile.in (LIBS): Include opcode library.
diff --git a/gas/configure.in b/gas/configure.in
index cfb2f667fb8..2dfd7008ec0 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -73,12 +73,21 @@ emulation=generic
 
 cpu_type=${target_cpu}
 
+# check for architecture variants
+case ${target_cpu} in
+sparclite) cpu_type=sparc ;;
+m680[01234]0) cpu_type=m68k ;;
+m683?2) cpu_type=m68k ;;
+esac
+
+gas_target=${cpu_type}
+
 # assign object format
 case ${target_os} in
 aix*)
 	case "${target_cpu}" in
 	i386)	obj_format=coff
-		target_cpu=i386aix
+		gas_target=i386aix
 		emulation=i386aix
 		;;
 	esac
@@ -93,23 +102,22 @@ bsd* | sunos*)
 udi)
 	obj_format=coffbfd
 	need_bfd="./../bfd/libbfd.a"
-	target_cpu=ebmon29k
+	gas_target=ebmon29k
 	;;
 ebmon-old)
 	obj_format=coff
 	need_bfd="./../bfd/libbfd.a"
-	target_cpu=ebmon29k
+	gas_target=ebmon29k
 	;;
 
 ebmon)
 	obj_format=coffbfd
 	need_bfd="./../bfd/libbfd.a"
-	target_cpu=ebmon29k
+	gas_target=ebmon29k
 	;;
 
 generic) obj_format=generic ;;
 
-
 xray | hms)
 	obj_format=coffbfd
 	need_bfd="./../bfd/libbfd.a"
@@ -129,6 +137,13 @@ sim)
 coff* | sysv*)
 	obj_format=coff
 
+	case ${target_cpu} in
+		m68*) 	obj_format=coffbfd
+		      	need_bfd="./../bfd/libbfd.a"
+			gas_target=m68kcoff
+			;;
+	esac
+
 	case ${target_vendor} in
 	bull)	emulation=dpx2 ;;
 	sco)	emulation=sco386 ;;
@@ -150,7 +165,7 @@ OSE | ose)
 	obj_format=aout
 	emulation=sun3
 	;;
-aout)
+aout | scout)
 	obj_format=aout
 	;;
 *)
@@ -176,16 +191,9 @@ vax)	atof=vax ;;
 *)	atof=ieee ;;
 esac
 
-# check for architecture variants
-case ${target_cpu} in
-sparclite) cpu_type=sparc ;;
-m680[01234]0) cpu_type=m68k ;;
-m683?2) cpu_type=m68k ;;
-esac
-
 # and target makefile frag
 
-target_makefile_frag=config/${target_cpu}.mt
+target_makefile_frag=config/${gas_target}.mt
 
 files="config/ho-${gas_host}.h config/tc-${cpu_type}.c \
 	config/tc-${cpu_type}.h config/te-${emulation}.h \
diff --git a/gas/read.c b/gas/read.c
index dfc1625913d..0a722e36d39 100644
--- a/gas/read.c
+++ b/gas/read.c
@@ -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();
-- 
2.30.2