[m-rev.] diff: avoid namespace cleanliness check failures on MinGW

Julien Fischer juliensf at csse.unimelb.edu.au
Wed Sep 14 16:59:27 AEST 2011


Branches: main, 11.07

Avoid failures in the namespace cleanliness check in .par grade on MinGW.

*/RESERVED_MACRO_NAMES:
 	Add some macros automatically defined by GCC on MinGW.

Julien.

Index: browser/RESERVED_MACRO_NAMES
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/browser/RESERVED_MACRO_NAMES,v
retrieving revision 1.6
diff -u -r1.6 RESERVED_MACRO_NAMES
--- browser/RESERVED_MACRO_NAMES	30 Aug 2006 14:11:48 -0000	1.6
+++ browser/RESERVED_MACRO_NAMES	14 Sep 2011 06:54:45 -0000
@@ -62,6 +62,14 @@
  __EXTENSIONS__
  __OPTIMIZE__
  __STRICT_ANSI__
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8
+__i686
+__i686__
+__pentiumpro
+__pentiumpro__
  #-----------------------------------------------------------------------------#
  # These are defined in when threads are enabled.
  _REENTRANT
Index: library/RESERVED_MACRO_NAMES
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/library/RESERVED_MACRO_NAMES,v
retrieving revision 1.5
diff -u -r1.5 RESERVED_MACRO_NAMES
--- library/RESERVED_MACRO_NAMES	30 Aug 2006 14:11:46 -0000	1.5
+++ library/RESERVED_MACRO_NAMES	14 Sep 2011 06:51:43 -0000
@@ -62,6 +62,14 @@
  __EXTENSIONS__
  __OPTIMIZE__
  __STRICT_ANSI__
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8
+__i686
+__i686__
+__pentiumpro
+__pentiumpro__
  #-----------------------------------------------------------------------------#
  # These are defined in exception.m. They are used to map this set of six
  # names, one for each declared mode of builtin.catch/3, down to the three
Index: mdbcomp/RESERVED_MACRO_NAMES
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/mdbcomp/RESERVED_MACRO_NAMES,v
retrieving revision 1.1
diff -u -r1.1 RESERVED_MACRO_NAMES
--- mdbcomp/RESERVED_MACRO_NAMES	15 Nov 2006 04:13:36 -0000	1.1
+++ mdbcomp/RESERVED_MACRO_NAMES	14 Sep 2011 06:55:43 -0000
@@ -62,6 +62,14 @@
  __EXTENSIONS__
  __OPTIMIZE__
  __STRICT_ANSI__
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8
+__i686
+__i686__
+__pentiumpro
+__pentiumpro__
  #-----------------------------------------------------------------------------#
  # These are defined in when threads are enabled.
  _REENTRANT
Index: runtime/RESERVED_MACRO_NAMES
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/runtime/RESERVED_MACRO_NAMES,v
retrieving revision 1.21
diff -u -r1.21 RESERVED_MACRO_NAMES
--- runtime/RESERVED_MACRO_NAMES	24 Nov 2009 23:49:45 -0000	1.21
+++ runtime/RESERVED_MACRO_NAMES	14 Sep 2011 06:51:58 -0000
@@ -68,6 +68,14 @@
  __EXTENSIONS__
  __GCC_HAVE_DWARF2_CFI_ASM
  __OPTIMIZE__
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8
+__i686
+__i686__
+__pentiumpro
+__pentiumpro__
  #-----------------------------------------------------------------------------#
  # These are defined in when threads are enabled.
  _REENTRANT
Index: ssdb/RESERVED_MACRO_NAMES
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/ssdb/RESERVED_MACRO_NAMES,v
retrieving revision 1.2
diff -u -r1.2 RESERVED_MACRO_NAMES
--- ssdb/RESERVED_MACRO_NAMES	5 Aug 2010 03:06:41 -0000	1.2
+++ ssdb/RESERVED_MACRO_NAMES	14 Sep 2011 06:55:06 -0000
@@ -62,6 +62,14 @@
  __EXTENSIONS__
  __OPTIMIZE__
  __STRICT_ANSI__
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8
+__i686
+__i686__
+__pentiumpro
+__pentiumpro__
  #-----------------------------------------------------------------------------#
  # These are defined when threads are enabled.
  _REENTRANT
Index: trace/RESERVED_MACRO_NAMES
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/trace/RESERVED_MACRO_NAMES,v
retrieving revision 1.4
diff -u -r1.4 RESERVED_MACRO_NAMES
--- trace/RESERVED_MACRO_NAMES	30 Aug 2006 14:11:48 -0000	1.4
+++ trace/RESERVED_MACRO_NAMES	14 Sep 2011 06:52:20 -0000
@@ -67,6 +67,14 @@
  _GNU_SOURCE
  __EXTENSIONS__
  __OPTIMIZE__
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8
+__i686
+__i686__
+__pentiumpro
+__pentiumpro__
  #-----------------------------------------------------------------------------#
  # These are defined in when threads are enabled.
  _REENTRANT

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------



More information about the reviews mailing list