[darcs-users] NestedVM - Fail: r_u commute bug

Brian Alliet brian at brianweb.net
Fri May 21 10:28:51 UTC 2004


Hi -

This is the same nestedvm repo that has been mentioned here a few times now.
I made some changes here at my end without pulling all the patches from the
repo at nestedvm.ibex.org. When I went to sync them up everything worked
fine (with some conflicts obviously, but they have been resolved) except for
this patch:

b at brian:~/tmp/my-nestedvm$ darcs get http://darcs.brianweb.net/nestedvm
Finished getting.
b at brian:~/tmp/my-nestedvm$ cd nestedvm
/Users/brian/tmp/my-nestedvm/nestedvm
b at brian:~/tmp/my-nestedvm/nestedvm$ darcs check
The repo is consistent!
b at brian:~/tmp/my-nestedvm/nestedvm$ darcs pull http://nestedvm.ibex.org/

Tue May 11 01:47:23 EDT 2004  adam at megacz.com
  * build_gcc_step2 needs mips_objects; mips_objects need newlib
Shall I pull this patch? [ynWvxqdjk?] y
So far so good... finished merging.

Fail: r_u commute bug, contact droundy at ag.o!
Original patch:
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./Makefile 113
-build/%.o: src/%.c $(tasks)/full_toolchain
+build/%.o: src/%.c $(tasks)/build_gcc
hunk ./Makefile 113
-build/%.o: src/%.c $(tasks)/full_toolchain
+
+# The nestedvm support library is special, it doesn't a full libc
+$(mips_c_objects): build/%.o: src/%.c $(tasks)/build_gcc $(tasks)/build_newlib $(tasks)/build_extraheaders
)
hunk ./Makefile 113
-build/%.o: src/%.c $(tasks)/build_gcc
+build/%.o: src/%.c $(tasks)/build_newlib
)
regrem 0.0 (
hunk ./Makefile 113
-build/%.o: src/%.c $(tasks)/full_toolchain
+
+# The nestedvm support library is special, it doesn't a full libc
+$(mips_c_objects): build/%.o: src/%.c $(tasks)/build_gcc $(tasks)/build_newlib $(tasks)/build_extraheaders
hunk ./Makefile 113
-build/%.o: src/%.c $(tasks)/full_toolchain
+build/%.o: src/%.c $(tasks)/build_gcc
)
)

b at brian:~/tmp/my-nestedvm/nestedvm$ 

I've reproduced the problem on 0.9.19 and .20. You should be able to
reproduce it by getting from darcs.brianweb.net/nestedvm then pulling from
nestedvm.ibex.org.

-Brian




More information about the darcs-users mailing list