Merge 'new' branch
authorSebastien Bourdeauducq <sb@m-labs.hk>
Wed, 4 Nov 2015 08:37:33 +0000 (16:37 +0800)
committerSebastien Bourdeauducq <sb@m-labs.hk>
Wed, 4 Nov 2015 08:41:34 +0000 (16:41 +0800)
1  2 
.gitmodules
misoc/software/compiler_rt

diff --cc .gitmodules
index 2f2413b1c0e1a72412efad8c7100be6921314c77,9b5c03e8a5801f835bd1695dd58359e6659d825f..1651ece301fb27f044c155f5b36f28f110665964
@@@ -1,12 -1,12 +1,12 @@@
- [submodule "extcores/lm32/submodule"]
-       path = extcores/lm32/submodule
+ [submodule "misoc/cores/lm32/verilog/submodule"]
+       path = misoc/cores/lm32/verilog/submodule
        url = https://github.com/m-labs/lm32.git
- [submodule "extcores/mor1kx/submodule"]
-       path = extcores/mor1kx/submodule
-       url = https://github.com/openrisc/mor1kx.git
- [submodule "software/compiler-rt"]
-       path = software/compiler-rt
+ [submodule "misoc/cores/mor1kx/verilog"]
 -      path = misoc/cores/mor1kx/verilog
 -      url = https://github.com/openrisc/mor1kx.git
++    path = misoc/cores/mor1kx/verilog
++    url = https://github.com/openrisc/mor1kx.git
+ [submodule "misoc/software/compiler_rt"]
+       path = misoc/software/compiler_rt
        url = http://llvm.org/git/compiler-rt.git
- [submodule "software/unwinder"]
-       path = software/unwinder
+ [submodule "misoc/software/unwinder"]
+       path = misoc/software/unwinder
        url = https://github.com/whitequark/libunwind
index 0000000000000000000000000000000000000000,a1448787a069603414e716adc8a41f866e28a4b4..7f1c97c76620a6ee795792e6120d98a7edf81e65
mode 000000,160000..160000
--- /dev/null
@@@ -1,0 -1,1 +1,1 @@@
 -Subproject commit a1448787a069603414e716adc8a41f866e28a4b4
++Subproject commit 7f1c97c76620a6ee795792e6120d98a7edf81e65