diff --git a/Makefile b/Makefile index a3bcfa3ea509512ed3bb461548d65b9856a4e48f..a8db5fc4f4f1265c6d226e0e0204e2d762967a78 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ clean: elfio_clean cd libtransform; make clean cd tools; make clean cd appfw; make clean - rm lib/* + rm -f lib/* bea: cd beaengine; cmake .; make all @@ -32,3 +32,4 @@ elfio: third_party/elfio-2.2.tar.gz elfio_clean: rm -Rf third_party/ELFIO + rm -Rf include/elfio diff --git a/appfw/Makefile b/appfw/Makefile index 68cb1269cc5e165892e7bc4b62ca6bd4639c4dd7..7c73a8e3f4afc87d871ae6e4fc23bbca0c0345c4 100644 --- a/appfw/Makefile +++ b/appfw/Makefile @@ -2,5 +2,5 @@ all: cd src; make all clean: - -rm lib/*.so + -rm -f lib/*.so cd src; make clean diff --git a/tools/transforms/PNTransformDriver.cpp b/tools/transforms/PNTransformDriver.cpp index 2ad98a47e16ff0ede657805d57e42318d41c9592..203eda31a90a0bbcd082d39977f93e08c76e249e 100644 --- a/tools/transforms/PNTransformDriver.cpp +++ b/tools/transforms/PNTransformDriver.cpp @@ -948,7 +948,7 @@ PNStackLayout* PNTransformDriver::Get_Next_Layout(validation_record &vr) { vector<PNStackLayout*> layouts; unsigned int level=vr.hierarchy_index; - for(;level<(int)transform_hierarchy.size()&&layouts.size()==0;level++) + for(;level<(unsigned int)transform_hierarchy.size()&&layouts.size()==0;level++) { layouts = GenerateInferences(vr.func, level); } @@ -1412,7 +1412,8 @@ bool PNTransformDriver::Validate(FileIR_t *virp, string name) string dirname = "p1.xform/" + name; string cmd = "mkdir -p " + dirname; - system(cmd.c_str()); + int res=system(cmd.c_str()); + assert(res!=-1); string aspri_filename = string(get_current_dir_name()) + "/" + dirname + "/a.irdb.aspri"; string bspri_filename = string(get_current_dir_name()) + "/" + dirname + "/a.irdb.bspri"; @@ -1450,9 +1451,10 @@ bool PNTransformDriver::Validate(FileIR_t *virp, string name) //If OK=BED(func), then commit int rt=system(new_instr); - int actual_exit = -1, actual_signal = -1; + int actual_exit = -1; +// int actual_signal = -1; if (WIFEXITED(rt)) actual_exit = WEXITSTATUS(rt); - else actual_signal = WTERMSIG(rt); +// else actual_signal = WTERMSIG(rt); int retval = actual_exit; //TODO: I have set exit code status 3 to indicate spasm failure diff --git a/tools/transforms/nulltransform.cpp b/tools/transforms/nulltransform.cpp index a38ea1f4da487f0a31ee0998830d0dab8615d830..06026a4ef049e495ba72ca143d639393b34ba981 100644 --- a/tools/transforms/nulltransform.cpp +++ b/tools/transforms/nulltransform.cpp @@ -15,7 +15,7 @@ int main(int argc, char **argv) NullTransform *nullTransform; if (argc == 3) - nullTransform = new NullTransform(argv[1], argv[2], "spri.out"); + nullTransform = new NullTransform(argv[1], argv[2], (char*)"spri.out"); else nullTransform = new NullTransform(argv[1], argv[2], argv[3]);