revert changes used for local testing

diff --git a/.gitmodules b/.gitmodules
index 1c0da89546915448e5c4398d60add3888ae2336e..eb033f5401d3c8a54f41b94e9e46723d44044612 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,5 +16,4 @@
        url = https://github.com/rust-lang/rust-installer.git
 [submodule "src/liblibc"]
        path = src/liblibc
-       url = https://github.com/japaric/libc.git
-       branch = mips-musl
+       url = https://github.com/rust-lang-nursery/libc.git

diff --git a/mk/cfg/mips-unknown-linux-musl.mk b/mk/cfg/mips-unknown-linux-musl.mk
index f7892bf041fed3b175e7d84f0f35eff3a1cf56e8..e9a6891a1b2dd24021a7085d4f99f9094051497a 100644 (file)
--- a/mk/cfg/mips-unknown-linux-musl.mk
+++ b/mk/cfg/mips-unknown-linux-musl.mk
@@ -1,8 +1,8 @@
 # mips-unknown-linux-musl configuration
-CC_mips-unknown-linux-musl=mips-openwrt-linux-gcc
-CXX_mips-unknown-linux-musl=mips-openwrt-linux-g++
-CPP_mips-unknown-linux-musl=mips-openwrt-linux-gcc -E
-AR_mips-unknown-linux-musl=mips-openwrt-linux-ar
+CC_mips-unknown-linux-musl=mips-linux-musl-gcc
+CXX_mips-unknown-linux-musl=mips-linux-musl-g++
+CPP_mips-unknown-linux-musl=mips-linux-musl-gcc -E
+AR_mips-unknown-linux-musl=mips-linux-musl-ar
 CFG_LIB_NAME_mips-unknown-linux-musl=lib$(1).so
 CFG_STATIC_LIB_NAME_mips-unknown-linux-musl=lib$(1).a
 CFG_LIB_GLOB_mips-unknown-linux-musl=lib$(1)-*.so

diff --git a/mk/cfg/mipsel-unknown-linux-musl.mk b/mk/cfg/mipsel-unknown-linux-musl.mk
index 632423cc881e9d7d738ee492f6648c52f9d009d7..659c71596d3ff422cc0cd70cbe776b2f9a0ecd33 100644 (file)
--- a/mk/cfg/mipsel-unknown-linux-musl.mk
+++ b/mk/cfg/mipsel-unknown-linux-musl.mk
@@ -1,8 +1,8 @@
 # mipsel-unknown-linux-musl configuration
-CC_mipsel-unknown-linux-musl=mipsel-openwrt-linux-gcc
-CXX_mipsel-unknown-linux-musl=mipsel-openwrt-linux-g++
-CPP_mipsel-unknown-linux-musl=mipsel-openwrt-linux-gcc
-AR_mipsel-unknown-linux-musl=mipsel-openwrt-linux-ar
+CC_mipsel-unknown-linux-musl=mipsel-linux-musl-gcc
+CXX_mipsel-unknown-linux-musl=mipsel-linux-musl-g++
+CPP_mipsel-unknown-linux-musl=mipsel-linux-musl-gcc
+AR_mipsel-unknown-linux-musl=mipsel-linux-musl-ar
 CFG_LIB_NAME_mipsel-unknown-linux-musl=lib$(1).so
 CFG_STATIC_LIB_NAME_mipsel-unknown-linux-musl=lib$(1).a
 CFG_LIB_GLOB_mipsel-unknown-linux-musl=lib$(1)-*.so

diff --git a/src/liblibc b/src/liblibc
index 81c05bcddb05d0e5facf66f3945405bbf50b04d3..53d11fc6ef10b7c30e85e9f2ff1f67f81ec8636f 160000 (submodule)
--- a/src/liblibc
+++ b/src/liblibc
@@ -1 +1 @@
-Subproject commit 81c05bcddb05d0e5facf66f3945405bbf50b04d3
+Subproject commit 53d11fc6ef10b7c30e85e9f2ff1f67f81ec8636f