Changes from net 2.5.2 release branch:

* configure.in: Put AC_DEFINE(sparcv9) on its own line, so that the shell
variable settings associated with it are permanent.  For CPUs requiring
bfd_gas=yes, select it based on CPU only, not individual target names.  Handle
m68k-hp-hpux*, not just -hpux.

* config/tc-z8k.c (tc_coff_symbol_emit_hook): Add dummy argument to match
prototype in obj-coff.h.

* configure.in: Skip tests for defining WANT_FOPEN_BIN and IBM_COMPILER_SUX.
* acconfig.h: Deleted them.
* configure, conf.in: Rebuild with autoconf 2.0.
* config/go32.cfg, config/vms-conf.h: Updated.

* config/tc-m68k.c (md_apply_fix_2, md_convert_frag_1): Always use
IBM_COMPILER_SUX version of code, with comments indicating why.

* listing.c (file_info): Use text mode when opening file for read.  Use "r"
directly, no macro.
* input-file.c (input_file_open): Don't use FOPEN_RT, just use "r".
* read.c (s_include): Ditto.
* output-file.c (output_file_create): Try both "wb" and "w", don't bother with
FOPEN_* macros.
* as.h: Don't include fopen-*.h.

* config/alpha-opcode.h: Make "ret" with no operands equivalent to "ret
zero,(ra)", to match OSF1 and to be consistent with both one-operand forms.

Patches from DJ Delorie:
* as.h (alloca): undef alloca before defining it just in case
* config/go32.cfg: new file for autoconf values
* config/te-go32.h: new file
* configure.bat: new for autoconf

* config/tc-i386.c (md_assemble): Fix typo in GOTPC check; had = for ==.

* configure.in: If target_frag doesn't exist, use /dev/null.

* as.c (parse_args): For non-VMS systems, re-add `v' to std_shortopts.  Add
"verbose" to list of long options.

* write.c (adjust_reloc_syms): When generating an absolute section symbol as a
placeholder, don't mark it as used in a relocation entry, here.

* Makefile.in (comparison): Compare using makefile code from gcc, stripped down
to discard subdir stuff and adapted to give a non-zero exit status if either
file differs.

3 files changed, 94 insertions, 12 deletions

diff --git a/gas/config/alpha-opcode.h b/gas/config/alpha-opcode.h
index af1c1d3..85955c9 100644
--- a/gas/config/alpha-opcode.h
+++ b/gas/config/alpha-opcode.h
@@ -221,7 +221,7 @@ static const struct alpha_opcode alpha_opcodes[] =
 { "jsr",        0x68004000, 0, "1,Bc" },	/* macro: lda $pv,L;jsr .. */
 { "ret",        0x68008000, 0, "1,(2),i" },
 { "ret",        0x68008000, 0, "1,(2)" },
-{ "ret",        0x6b5a8000, 0, "" },		/* macro: ret ra,(ra) */
+{ "ret",        0x6bfa8000, 0, "" },		/* macro: ret zero,(ra) */
 { "ret",        0x6be08000, 0, "(2)" },		/* macro: ret zero,(2) */
 { "ret",        0x681a8000, 0, "1" },		/* macro: ret 1,(ra) */
 { "jcr",        0x6800c000, 0, "1,(2)" },
diff --git a/gas/config/go32.cfg b/gas/config/go32.cfg
new file mode 100644
index 0000000..4059395
--- /dev/null
+++ b/gas/config/go32.cfg
@@ -0,0 +1,93 @@
+/* config.h for go32 */

+

+#define I386COFF 1

+

+/* Define if using alloca.c.  */

+#undef C_ALLOCA

+

+/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.

+   This function is required for alloca.c support on those systems.  */

+#undef CRAY_STACKSEG_END

+

+/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */

+#undef HAVE_ALLOCA_H

+

+/* Define as __inline if that's what the C compiler calls it.  */

+#undef inline

+

+/* If using the C implementation of alloca, define if you know the

+   direction of stack growth for your system; otherwise it will be

+   automatically deduced at run-time.

+	STACK_DIRECTION > 0 => grows toward higher addresses

+	STACK_DIRECTION < 0 => grows toward lower addresses

+	STACK_DIRECTION = 0 => direction of growth unknown

+ */

+#undef STACK_DIRECTION

+

+/* Should gas use high-level BFD interfaces?  */

+#undef BFD_ASSEMBLER

+

+/* If we aren't doing cross-assembling, some operations can be optimized,

+   since byte orders and value sizes don't need to be adjusted.  */

+#undef CROSS_COMPILE

+

+/* Some gas code wants to know these parameters.  */

+#define TARGET_ALIAS		"i386"

+#define TARGET_CPU		"i386"

+#define TARGET_CANONICAL	"i386-i386"

+#define TARGET_OS		"djgpp"

+#define TARGET_VENDOR		"djgpp"

+

+/* Some operating systems, for example DOS, require the use of "wb" mode when

+   opening a binary file for writing.  If only "w" is used, the file will not

+   be correct.  However, some other systems reject such a mode.  This indicates

+   which ../include/fopen-*.h header file we want to include, so that we can

+   get macros that'll do the right thing for this system.  */

+#define WANT_FOPEN_BIN 1

+

+/* Sometimes the system header files don't declare malloc and realloc.  */

+#undef NEED_DECLARATION_MALLOC

+

+/* Sometimes the system header files don't declare free.  */

+#undef NEED_DECLARATION_FREE

+

+/* Sometimes errno.h doesn't declare errno itself.  */

+#undef NEED_DECLARATION_ERRNO

+

+#define MANY_SEGMENTS 1

+

+/* Needed only for sparc configuration */

+#undef sparcv9

+

+/* Define if you have the remove function.  */

+#define HAVE_REMOVE 1

+

+/* Define if you have the unlink function.  */

+#define HAVE_UNLINK 1

+

+/* Define if you have the <errno.h> header file.  */

+#define HAVE_ERRNO_H 1

+

+/* Define if you have the <memory.h> header file.  */

+#define HAVE_MEMORY_H 1

+

+/* Define if you have the <stdarg.h> header file.  */

+#define HAVE_STDARG_H 1

+

+/* Define if you have the <stdlib.h> header file.  */

+#define HAVE_STDLIB_H 1

+

+/* Define if you have the <string.h> header file.  */

+#define HAVE_STRING_H 1

+

+/* Define if you have the <strings.h> header file.  */

+#undef HAVE_STRINGS_H

+

+/* Define if you have the <sys/types.h> header file.  */

+#define HAVE_SYS_TYPES_H 1

+

+/* Define if you have the <unistd.h> header file.  */

+#define HAVE_UNISTD_H 1

+

+/* Define if you have the <varargs.h> header file.  */

+#undef HAVE_VARARGS_H

diff --git a/gas/config/vms-conf.h b/gas/config/vms-conf.h
index b83034e..da32c44 100644
--- a/gas/config/vms-conf.h
+++ b/gas/config/vms-conf.h
@@ -47,10 +47,6 @@
    since byte orders and value sizes don't need to be adjusted.  */
 #undef CROSS_COMPILE
 
-/* Some IBM compilers can't handle some of the (rather basic) constructs
-   used in the 68k support code.  */
-#undef IBM_COMPILER_SUX
-
 /* Some gas code wants to know these parameters.  */
 #define TARGET_ALIAS	"vms"
 #define TARGET_CPU	"vax"
@@ -58,13 +54,6 @@
 #define TARGET_OS	"vms"
 #define TARGET_VENDOR	"dec"
 
-/* Some operating systems, for example DOS, require the use of "wb" mode when
-   opening a binary file for writing.  If only "w" is used, the file will not
-   be correct.  However, some other systems reject such a mode.  This indicates
-   which ../include/fopen-*.h header file we want to include, so that we can
-   get macros that'll do the right thing for this system.  */
-#undef WANT_FOPEN_BIN
-
 /* Sometimes the system header files don't declare malloc and realloc.  */
 #undef NEED_DECLARATION_MALLOC