On Wed, Apr 23, 2014 at 11:22 PM, Peter Gavin <[email protected]> wrote: > Ok, these are merged now. FYI, I had a few conflicts when cherry picking > onto the or32 branch, though. It seems the trees diverged at some point in > the past. >
After these got applied, when I try to run 'make check' in the or32-master branch, I'm greeted with this: make[4]: Entering directory `/home/stefan/openrisc/or1ksim/build-or1ksim-or32/testsuite/test-code-or1k/inst-set-test' make[4]: `libinst-set-test.la' is up to date. CPPAS is-add-test.o ../../../../or1ksim-or32-master/testsuite/test-code-or1k/inst-set-test/is-add-test.S: Assembler messages: ../../../../or1ksim-or32-master/testsuite/test-code-or1k/inst-set-test/is-add-test.S:297: Error: unknown opcode1: `or1k_delayed_nop(l.bnf 53f)' ../../../../or1ksim-or32-master/testsuite/test-code-or1k/inst-set-test/is-add-test.S:297: Error: unknown opcode1: `or1k_delayed_nop(l.bnf 54f)' <...> ../../../../or1ksim-or32-master/testsuite/test-code-or1k/inst-set-test/is-add-test.S:1320: Error: unknown opcode1: `or1k_delayed_nop(l.bnf 59f)' ../../../../or1ksim-or32-master/testsuite/test-code-or1k/inst-set-test/is-add-test.S:1320: Error: unknown opcode1: `or1k_delayed_nop(l.j 60f)' make[4]: *** [is-add-test.o] Error 1 make[4]: Leaving directory `/home/stefan/openrisc/or1ksim/build-or1ksim-or32/testsuite/test-code-or1k/inst-set-test' make[3]: *** [check-am] Error 2 make[3]: Leaving directory `/home/stefan/openrisc/or1ksim/build-or1ksim-or32/testsuite/test-code-or1k/inst-set-test' make[2]: *** [check-recursive] Error 1 make[2]: Leaving directory `/home/stefan/openrisc/or1ksim/build-or1ksim-or32/testsuite/test-code-or1k' make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory `/home/stefan/openrisc/or1ksim/build-or1ksim-or32/testsuite' make: *** [check-recursive] Error 1 I haven't made an effort bisecting which commit introduced this, maybe you can spot it without me doing that? Stefan _______________________________________________ OpenRISC mailing list [email protected] http://lists.openrisc.net/listinfo/openrisc
