Changeset 919d1ba for src/tests

Timestamp:

Jul 11, 2016, 5:20:08 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

6f72453

Parents:

cad355a (diff), deefdc1 (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

Location:

src/tests

Files:

• .expect/extension.txt (modified) (1 diff)
• .expect/gccExtensions.txt (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• avltree/avl.h (modified) (1 diff)
• avltree/avl1.c (modified) (1 diff)
• avltree/avl_test.c (modified) (1 diff)
• init_once.c (modified) (2 diffs)

src/tests/.expect/extension.txt

@@ +1 @@
+extern void *malloc(long unsigned int __size);
+extern void free(void *__ptr);
 extern void abort(void);
 extern int atexit(void (*__func)(void));
 extern void exit(int __status);
+extern int printf(const char *__restrict __format, ...);
 __extension__ int __a__i_1;
 __extension__ int __b__i_1;

src/tests/.expect/gccExtensions.txt

@@ +1 @@
+extern void *malloc(long unsigned int __size);
+extern void free(void *__ptr);
 extern void abort(void);
 extern int atexit(void (*__func)(void));
 extern void exit(int __status);
+extern int printf(const char *__restrict __format, ...);
 int main(int __argc__i_1, const char **__argv__PPCc_1){
     asm ( "nop" :  :  :  );

src/tests/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Mon Jun 27 14:39:08 2016
-## Update Count     : 34
+## Last Modified On : Sat Jul  9 11:23:24 2016
+## Update Count     : 35
 ###############################################################################
 
 # applies to both programs
-CFLAGS = -g -Wall -Wno-unused-function # TEMPORARY: does not build with -O2
+CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ # TEMPORARY: does not build with -O2
 CC = @CFA_BINDIR@/cfa
 

src/tests/Makefile.in

@@ -114 +114 @@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@
+CFA_FLAGS = @CFA_FLAGS@
 CFA_INCDIR = @CFA_INCDIR@
 CFA_LIBDIR = @CFA_LIBDIR@
@@ -119 +120 @@
 
 # applies to both programs
-CFLAGS = -g -Wall -Wno-unused-function # TEMPORARY: does not build with -O2
+CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ # TEMPORARY: does not build with -O2
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@

src/tests/avltree/avl.h

@@ -4 +4 @@
 extern "C" {
 #define NULL 0
-void free(void *);
 #define assert(cond) if (! (cond)) { printf("Assertion failed: (%s) at %s:%d\n", #cond, __FILE__, __LINE__); abort(); }
-int printf(const char *, ...);
 }
 

src/tests/avltree/avl1.c

@@ -1 +1 @@
 #include "avl.h"
 // #include "cwrap.h"
-
-extern "C" {
-  void * malloc(long int);
-}
 
 forall(otype K | Comparable(K), otype V)

src/tests/avltree/avl_test.c

@@ -3 +3 @@
 
 extern "C" {
-  int printf(const char *, ...);
   int strcmp(const char *, const char *);
 }

src/tests/init_once.c

@@ -10 +10 @@
 // Created On       : Tue Jun 14 15:43:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul  5 16:40:07 2016
-// Update Count     : 2
+// Last Modified On : Sat Jul  9 11:30:29 2016
+// Update Count     : 3
 //
 
@@ -23 +23 @@
 //*** setup
 extern "C" {
-typedef unsigned long int size_t;
 #define NULL 0
 void * malloc(size_t);
 void free(void *);
 #define assert(cond) if (! (cond)) { printf("Assertion failed: (%s) at %s:%d\n", #cond, __FILE__, __LINE__); abort(); }
-int printf(const char *, ...);
 void *memset(void *s, int c, size_t n);
 }