diff: fix for SunOS4.x problem

[Fergus Henderson]

Tyson Richard DOWD <trd at students.cs.mu.OZ.AU> writes:

>It would be nice if the technical term for assembler missing a
>feature wasn't "barf".

configure.in:
runtime/conf.h.in:
runtime/goto.h:
	Use more neutral terminology: s/barfs on/cannot grok/

Index: configure.in
===================================================================
RCS file: /home/staff/zs/imp/mercury/configure.in,v
retrieving revision 1.112
diff -u -u -r1.112 configure.in
--- configure.in	1997/10/08 13:15:39	1.112
+++ configure.in	1997/10/12 05:35:56
@@ -1294,20 +1294,20 @@
 AC_SUBST(HAVE_DELAY_SLOT)
 
 #-----------------------------------------------------------------------------#
-AC_MSG_CHECKING(whether the assembler barfs on .type)
-AC_CACHE_VAL(mercury_cv_barfs_on_asm_type_directive, [
+AC_MSG_CHECKING(whether the assembler does not handle .type)
+AC_CACHE_VAL(mercury_cv_cannot_grok_asm_type_directive, [
 	case "$host" in
 		*-sunos4.*)
-			mercury_cv_barfs_on_asm_type_directive=yes
+			mercury_cv_cannot_grok_asm_type_directive=yes
 			;;
 		*)
-			mercury_cv_barfs_on_asm_type_directive=no
+			mercury_cv_cannot_grok_asm_type_directive=no
 			;;
 	esac
 ])
-AC_MSG_RESULT($mercury_cv_barfs_on_asm_type_directive)
-if test $mercury_cv_barfs_on_asm_type_directive = "yes"; then
-	AC_DEFINE(MR_BARFS_ON_ASM_TYPE_DIRECTIVE)
+AC_MSG_RESULT($mercury_cv_cannot_grok_asm_type_directive)
+if test $mercury_cv_cannot_grok_asm_type_directive = "yes"; then
+	AC_DEFINE(MR_CANNOT_GROK_ASM_TYPE_DIRECTIVE)
 fi
 #-----------------------------------------------------------------------------#
 AC_MSG_CHECKING(whether Mercury supports shared libraries on this system)
Index: runtime/conf.h.in
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/conf.h.in,v
retrieving revision 1.23
diff -u -u -r1.23 conf.h.in
--- conf.h.in	1997/10/07 17:29:25	1.23
+++ conf.h.in	1997/10/12 05:37:35
@@ -188,9 +188,9 @@
 #undef USE_DLLS
 
 /*
-** For SPARC systems, does `as' barf if we use `.type' in inline asm?
+** For SPARC systems, does `as' not allow `.type' in inline asm?
 ** (True for SunOS 4.x.)
 */
-#undef MR_BARFS_ON_ASM_TYPE_DIRECTIVE
+#undef MR_CANNOT_GROK_ASM_TYPE_DIRECTIVE
 
 #endif /* CONF_H */
Index: runtime/goto.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/goto.h,v
retrieving revision 1.33
diff -u -u -r1.33 goto.h
--- goto.h	1997/10/07 17:29:29	1.33
+++ goto.h	1997/10/12 05:38:00
@@ -243,12 +243,13 @@
 
   #endif /* PIC */
 
-  /* For Solaris 5.5.1, we need to declare that the type of labels is
+  /*
+  ** For Solaris 5.5.1, we need to declare that the type of labels is
   ** #function (i.e. code, not data), otherwise the dynamic linker seems
   ** to get confused, and we end up jumping into the data section.
   ** Hence the `.type' directive below.
   */
-  #ifndef MR_BARFS_ON_ASM_TYPE_DIRECTIVE
+  #ifndef MR_CANNOT_GROK_ASM_TYPE_DIRECTIVE
     #define INLINE_ASM_ENTRY_LABEL_TYPE(label) \
 	"	.type _entry_" stringify(label) ",#function\n"
   #endif