Changeset 298ed08 for src/libcfa/exception.c

Timestamp:

Feb 9, 2018, 4:45:50 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

43c6dc82

Parents:

826a67c (diff), bede27b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/libcfa/exception.c (modified) (3 diffs)

src/libcfa/exception.c

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Mon Jun 26 15:13:00 2017
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr Aug 17 15:45:00 2017
-// Update Count     : 7
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Feb  9 14:41:55 2018
+// Update Count     : 8
 //
 
@@ -453 +453 @@
 // match, which is no way generic.  Some more works need to be done if we want to have a single call to the try routine.
 
-#if defined( __x86_64__ ) || defined( __i386__ )
+#if defined( __i386 ) || defined( __x86_64 )
 asm (
         //HEADER
@@ -476 +476 @@
 //      "       .section        .note.GNU-stack,\"x\",@progbits\n"
 );
-#endif // __x86_64__ || __i386__
+#endif // __i386 || __x86_64