[m-rev.] diff: fix for build problem with GCC 3.0

Fergus Henderson fjh at cs.mu.OZ.AU
Wed Aug 1 07:25:57 AEST 2001


This fixes a problem that occurs when trying to build Mercury
with GCC 3.0.  However, other problems still remain.

Estimated hours taken: 0.5
Branches: main, release

runtime/mercury_goto.h:
	Delete a work-around for a bug in a gcc "2.97" snapshot,
	since the bug has been fixed in gcc 3.0, and the work-around
	breaks with gcc 3.0.  We don't care about compatibility with
	obsolete unreleased snapshot versions of gcc.

Workspace: /home/mars/fjh/ws1/mercury
Index: runtime/mercury_goto.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_goto.h,v
retrieving revision 1.29
diff -u -d -r1.29 mercury_goto.h
--- runtime/mercury_goto.h	2001/05/31 06:00:13	1.29
+++ runtime/mercury_goto.h	2001/07/31 21:19:35
@@ -213,19 +213,7 @@
     */
     #if defined(__i386__)
 
-      #if __GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 97
-        /*
-	** The gcc 2.97 snapshot that I tried didn't convert
-	** "%%" in inline asm into "%".  So for gcc >= 2.97,
-	** just use one % symbol.
-	** (This behaviour is contrary to the gcc manual, but
-	** using %% like it says in the manual doesn't work,
-	** so we have to use %.)
-	*/
-        #define MR_EBX "%ebx"
-      #else
-        #define MR_EBX "%%ebx"
-      #endif
+      #define MR_EBX "%%ebx"
 
       #define MR_INLINE_ASM_FIXUP_REGS     				\
     	"	call 0f\n"     						\

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------



More information about the reviews mailing list