att_syntax not building after merge

[jdetter]

I merged att_syntax with master and now we're having an issue building due to some register names not being recognised. @ssunny7 can you pull the latest att_syntax and take a look?

Scanning dependencies of target common
make[2]: warning:  Clock skew detected.  Your build may be incomplete.
make[2]: Warning: File 'common/CMakeFiles/common.dir/depend.make' has modification time 3 s in the future
[  2%] Building CXX object common/CMakeFiles/common.dir/src/Ident.C.o
[  2%] Building CXX object common/CMakeFiles/common.dir/src/Timer.C.o
[  3%] Building CXX object common/CMakeFiles/common.dir/src/Types.C.o
[  3%] Building CXX object common/CMakeFiles/common.dir/src/string-regex.C.o
[  3%] Building CXX object common/CMakeFiles/common.dir/src/debugOstream.C.o
[  3%] Building CXX object common/CMakeFiles/common.dir/src/lprintf.C.o
[  3%] Building CXX object common/CMakeFiles/common.dir/src/pathName.C.o
[  4%] Building CXX object common/CMakeFiles/common.dir/src/Time.C.o
[  4%] Building CXX object common/CMakeFiles/common.dir/src/fraction.C.o
[  4%] Building CXX object common/CMakeFiles/common.dir/src/timing.C.o
[  4%] Building CXX object common/CMakeFiles/common.dir/src/stats.C.o
[  4%] Building CXX object common/CMakeFiles/common.dir/src/Annotatable.C.o
[  5%] Building CXX object common/CMakeFiles/common.dir/src/MappedFile.C.o
[  5%] Building CXX object common/CMakeFiles/common.dir/src/sha1.C.o
[  5%] Building CXX object common/CMakeFiles/common.dir/src/serialize-bin.C.o
[  5%] Building CXX object common/CMakeFiles/common.dir/src/serialize-xml.C.o
[  6%] Building CXX object common/CMakeFiles/common.dir/src/util.C.o
[  6%] Building CXX object common/CMakeFiles/common.dir/src/Node.C.o
[  6%] Building CXX object common/CMakeFiles/common.dir/src/Graph.C.o
[  6%] Building CXX object common/CMakeFiles/common.dir/src/Edge.C.o
[  6%] Building CXX object common/CMakeFiles/common.dir/src/DOT.C.o
[  7%] Building CXX object common/CMakeFiles/common.dir/src/dyn_regs.C.o
/home/d/detter/Workspace/dyninst/devel/att_syntax/common/src/dyn_regs.C: In member function ‘void Dyninst::MachRegister::getROSERegister(int&, int&, int&)’:
/home/d/detter/Workspace/dyninst/devel/att_syntax/common/src/dyn_regs.C:816:20: error: ‘zr’ is not a member of ‘Dyninst::aarch64’
      if(baseID == (aarch64::zr & 0xFF) || baseID == (aarch64::wzr & 0xFF))
                    ^
common/CMakeFiles/common.dir/build.make:608: recipe for target 'common/CMakeFiles/common.dir/src/dyn_regs.C.o' failed
make[2]: *** [common/CMakeFiles/common.dir/src/dyn_regs.C.o] Error 1
make[2]: *** Waiting for unfinished jobs....
CMakeFiles/Makefile2:255: recipe for target 'common/CMakeFiles/common.dir/all' failed
make[1]: *** [common/CMakeFiles/common.dir/all] Error 2
Makefile:116: recipe for target 'all' failed
make: *** [all] Error 2

[ssunny7]

@jdetter Did you merge att_syntax into master or the other way round?

[jdetter]

I merged master into AT&T syntax but it shouldn't matter should it?

[ssunny7]

Not really, just wanted to makes sure I understood correctly.

[ssunny7]

Merging either branch into the other brings up the issue you reported. This is most likely due to some merge problem. We should get together and talk about this.

[ssunny7]

This is no longer an issue - the build goes through fine. It is the tests that fail after merge, and we already have a PR open for the merge and tracking the test failures (#244).

@jdetter I think this can be closed.

[nathanhjay]

@ssunny7 Does this issue still exist on the att syntax branch? I pulled the att_syntax branch and ran into the same bug with that branch alone. I don't have any local changes to Dyninst, so I used

git checkout att_syntax
git reset --hard origin/att_syntax

to pull a fresh copy of the branch and this issue persists.

[jdetter]

@nathanhjay Can you post the build issues?

[nathanhjay]

@jdetter here is the build issue:

/nobackup/local_builds/dyninst/common/src/dyn_regs.C: In member function ‘void Dyninst::MachRegister::getROSERegister(int&, int&, int&)’:
/nobackup/local_builds/dyninst/common/src/dyn_regs.C:816:20: error: ‘zr’ is not a member of ‘Dyninst::aarch64’
      if(baseID == (aarch64::zr & 0xFF) || baseID == (aarch64::wzr & 0xFF))
                    ^
make[2]: *** [common/CMakeFiles/common.dir/src/dyn_regs.C.o] Error 1

Is there any other info you need?

[jdetter]

@ssunny7 Are we still using this branch or are we using the new branch? Nathan is having the original merge issue.

[ssunny7]

@nathanhjay I'd advise using att_syntax_formerge. That branch has all merge issues fixed and will also merge cleanly into master. (It is also our branch going ahead for syntax fixes and will be renamed to att_syntax later when the current branch of the same name is deleted).

[nathanhjay]

Okay, thanks.