* config/tc-i386.c: Deal with LEX_QM the same way as with LEX_AT.

* config/te-netware.h: New file.
* config/te-ppcnw.h: Delete: Obsolete.
* configure.in: Eliminate ill NetWare targets. Make generic
  NetWare target use proper emulation.
* Makefile.am: Eliminate reference to obsolete te-ppcnw.h, add
  reference to new te-netware.h.
* configure: Regenerate.
* Makefile.in: Regenerate.

7 files changed, 27 insertions, 43 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index da45ddf..3d93a17 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,15 @@
+2004-06-17  Jan Beulich <jbeulich@novell.com>
+
+	* config/tc-i386.c: Deal with LEX_QM the same way as with LEX_AT.
+	* config/te-netware.h: New file.
+	* config/te-ppcnw.h: Delete: Obsolete.
+	* configure.in: Eliminate ill NetWare targets. Make generic
+	NetWare target use proper emulation.
+	* Makefile.am: Eliminate reference to obsolete te-ppcnw.h, add
+	reference to new te-netware.h.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+
 2004-06-15  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
 	* config/tc-s390.c (s390_insn): Avoid incorrect signed/unsigned
diff --git a/gas/Makefile.am b/gas/Makefile.am
index 995d3df..6d048d9 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -391,9 +391,9 @@ TARG_ENV_HFILES = \
 	config/te-macos.h \
 	config/te-nbsd.h \
 	config/te-nbsd532.h \
+	config/te-netware.h \
 	config/te-pc532mach.h \
 	config/te-pe.h \
-	config/te-ppcnw.h \
 	config/te-psos.h \
 	config/te-riscix.h \
 	config/te-sparcaout.h \
diff --git a/gas/Makefile.in b/gas/Makefile.in
index 6fc46e3..12d7a6e 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -618,9 +618,9 @@ TARG_ENV_HFILES = \
 	config/te-macos.h \
 	config/te-nbsd.h \
 	config/te-nbsd532.h \
+	config/te-netware.h \
 	config/te-pc532mach.h \
 	config/te-pe.h \
-	config/te-ppcnw.h \
 	config/te-psos.h \
 	config/te-riscix.h \
 	config/te-sparcaout.h \
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index f37c259..823435f 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -182,15 +182,19 @@ typedef struct _i386_insn i386_insn;
 
 /* List of chars besides those in app.c:symbol_chars that can start an
    operand.  Used to prevent the scrubber eating vital white-space.  */
+const char extra_symbol_chars[] = "*%-(["
 #ifdef LEX_AT
-const char extra_symbol_chars[] = "*%-(@[";
-#else
-const char extra_symbol_chars[] = "*%-([";
+	"@"
+#endif
+#ifdef LEX_QM
+	"?"
 #endif
+	;
 
 #if (defined (TE_I386AIX)				\
      || ((defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF))	\
 	 && !defined (TE_LINUX)				\
+ 	 && !defined (TE_NETWARE)			\
 	 && !defined (TE_FreeBSD)			\
 	 && !defined (TE_NetBSD)))
 /* This array holds the chars that always start a comment.  If the
@@ -972,6 +976,10 @@ md_begin ()
 #ifdef LEX_AT
     identifier_chars['@'] = '@';
 #endif
+#ifdef LEX_QM
+    identifier_chars['?'] = '?';
+    operand_chars['?'] = '?';
+#endif
     digit_chars['-'] = '-';
     identifier_chars['_'] = '_';
     identifier_chars['.'] = '.';
diff --git a/gas/config/te-ppcnw.h b/gas/config/te-ppcnw.h
deleted file mode 100644
index 1337591..0000000
--- a/gas/config/te-ppcnw.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* te-ppcnw.h -- Power PC running Netware environment declarations.
-   Copyright 1994, 1995, 2000 Free Software Foundation, Inc.
-
-   This file is part of GAS, the GNU Assembler.
-
-   GAS is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   GAS is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GAS; see the file COPYING.  If not, write to
-   the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
-
-/* Added these, because if we don't know what we're targeting we may
-   need an assembler version of libgcc, and that will use local
-   labels.  */
-#define LOCAL_LABELS_DOLLAR 1
-#define LOCAL_LABELS_FB 1
-
-/* these define interfaces */
-#include "obj-format.h"
-
-/* gcc uses escape sequences for ppc/netware.  */
-
-#undef NO_STRING_ESCAPES
diff --git a/gas/configure b/gas/configure
index 666d783..1f83fbf 100755
--- a/gas/configure
+++ b/gas/configure
@@ -4229,7 +4229,6 @@ for this_target in $target $canon_targets ; do
       a29k-*-vxworks*)			fmt=coff ;;
 
       alpha*-*-*vms*)			fmt=evax ;;
-      alpha*-*-netware*)		fmt=ecoff ;;
       alpha*-*-osf*)			fmt=ecoff ;;
       alpha*-*-linuxecoff*)		fmt=ecoff ;;
       alpha*-*-linux-gnu*)		fmt=elf em=linux ;;
@@ -4490,7 +4489,6 @@ echo "$as_me: error: Solaris must be configured little endian" >&2;}
 	    fi ;;
       ppc-*-rtems*)			fmt=elf ;;
       ppc-*-macos*)			fmt=coff em=macos ;;
-      ppc-*-netware*)			fmt=elf em=ppcnw ;;
       ppc-*-nto*)			fmt=elf ;;
       ppc-*-kaos*)			fmt=elf ;;
       ppc-*-lynxos*)			fmt=elf em=lynx bfd_gas=yes ;;
@@ -4579,7 +4577,7 @@ echo "$as_me: error: Solaris must be configured little endian" >&2;}
       *-*-elf | *-*-sysv4* | *-*-solaris*) fmt=elf dev=yes ;;
       *-*-aros*)			fmt=elf em=linux bfd_gas=yes ;;
       *-*-vxworks | *-*-windiss)	fmt=elf ;;
-      *-*-netware)			fmt=elf ;;
+      *-*-netware)			fmt=elf em=netware ;;
     esac
 
     if test ${this_target} = $target ; then
diff --git a/gas/configure.in b/gas/configure.in
index 446f689..ab6460c 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -190,7 +190,6 @@ changequote([,])dnl
       a29k-*-vxworks*)			fmt=coff ;;
 
       alpha*-*-*vms*)			fmt=evax ;;
-      alpha*-*-netware*)		fmt=ecoff ;;
       alpha*-*-osf*)			fmt=ecoff ;;
       alpha*-*-linuxecoff*)		fmt=ecoff ;;
       alpha*-*-linux-gnu*)		fmt=elf em=linux ;;
@@ -434,7 +433,6 @@ changequote([,])dnl
 	    fi ;;
       ppc-*-rtems*)			fmt=elf ;;
       ppc-*-macos*)			fmt=coff em=macos ;;
-      ppc-*-netware*)			fmt=elf em=ppcnw ;;
       ppc-*-nto*)			fmt=elf ;;
       ppc-*-kaos*)			fmt=elf ;;
       ppc-*-lynxos*)			fmt=elf em=lynx bfd_gas=yes ;;
@@ -523,7 +521,7 @@ changequote([,])dnl
       *-*-elf | *-*-sysv4* | *-*-solaris*) fmt=elf dev=yes ;;
       *-*-aros*)			fmt=elf em=linux bfd_gas=yes ;;
       *-*-vxworks | *-*-windiss)	fmt=elf ;;
-      *-*-netware)			fmt=elf ;;
+      *-*-netware)			fmt=elf em=netware ;;
     esac
 
     if test ${this_target} = $target ; then