Fix build in ARM #87
This merge request proposes a fix for #87 (closed).
Most changes are cherry picked from the following VTM commits:
This merge request proposes a fix for #87 (closed).
Most changes are cherry picked from the following VTM commits: