Rename internal ABI mipsr6 as mips32r6

The 32-bit r6 should really be named as mips32r6
Note that r6 is the default for mips64

See comment in https://android-review.googlesource.com/#/c/116410/3/core/binary.mk
for details

Change-Id: I2bd095d226413ae9f91f054c43f3c35a9ebaeea2

11 files changed, 17 insertions, 15 deletions

diff --git a/build/tools/build-compiler-rt.sh b/build/tools/build-compiler-rt.sh
index 8f13def08..5fcb3fa52 100755
--- a/build/tools/build-compiler-rt.sh
+++ b/build/tools/build-compiler-rt.sh
@@ -178,7 +178,7 @@ prepare_compiler_rt_source_for_abi ()
         ARCH_SOURCES="$COMPILER_RT_ARM_SOURCES"
     elif [ $ABI = "x86" ]; then
         ARCH_SOURCES="$COMPILER_RT_X86_SOURCES"
-    elif [ $ABI = "mips" -o $ABI = "mipsr6" ]; then
+    elif [ $ABI = "mips" -o $ABI = "mips32r6" ]; then
         ARCH_SOURCES="$COMPILER_RT_MIPS_SOURCES"
     elif [ $ABI = "x86_64" ]; then
         ARCH_SOURCES="$COMPILER_RT_X86_64_SOURCES"
diff --git a/build/tools/build-cxx-stl.sh b/build/tools/build-cxx-stl.sh
index cd5f27e27..ca1cb9d1c 100755
--- a/build/tools/build-cxx-stl.sh
+++ b/build/tools/build-cxx-stl.sh
@@ -99,7 +99,7 @@ fi
 ABIS=$(commas_to_spaces $ABIS)
 UNKNOWN_ABIS=
 if [ "$ABIS" = "${ABIS%%64*}" ]; then
-    UNKNOWN_ABIS="$(filter_out "$PREBUILT_ABIS mipsr6" "$ABIS" )"
+    UNKNOWN_ABIS="$(filter_out "$PREBUILT_ABIS mips32r6" "$ABIS" )"
     if [ -n "$UNKNOWN_ABIS" ] && [ -n "$(find_ndk_unknown_archs)" ]; then
         ABIS="$(filter_out "$UNKNOWN_ABIS" "$ABIS")"
         ABIS="$ABIS $(find_ndk_unknown_archs)"
@@ -537,7 +537,7 @@ build_stl_libs_for_abi ()
             EXTRA_CFLAGS="-mfix-cortex-a53-835769"
             EXTRA_CXXFLAGS="-mfix-cortex-a53-835769"
             ;;
-        mipsr6)
+        mips32r6)
             EXTRA_CFLAGS="-mips32r6"
             EXTRA_CXXFLAGS="-mips32r6"
             EXTRA_LDFLAGS="-mips32r6"
diff --git a/build/tools/build-device-llvm.sh b/build/tools/build-device-llvm.sh
index 9e04f3140..35006cefd 100755
--- a/build/tools/build-device-llvm.sh
+++ b/build/tools/build-device-llvm.sh
@@ -175,7 +175,7 @@ for abi in $ABIS; do
         CFLAGS=$CFLAGS" -mhard-float -D_NDK_MATH_NO_SOFTFP=1 -Wl,--no-warn-mismatch -lm_hard"
       fi
       ;;
-    mips|mipsr6)
+    mips|mips32r6)
       CFLAGS=$CFLAGS" -fmessage-length=0 -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers"
       ;;
   esac
diff --git a/build/tools/build-gcc.sh b/build/tools/build-gcc.sh
index 2e0041d64..79e1df6db 100755
--- a/build/tools/build-gcc.sh
+++ b/build/tools/build-gcc.sh
@@ -472,7 +472,7 @@ unwind_library_for_abi ()
           pr-support.o \
           unwind-c.o"
     ;;
-    x86|mips|mipsr6)
+    x86|mips|mips32r6)
     BASE_DIR="$BUILD_OUT/gcc-$CONFIGURE_GCC_VERSION/$ABI_CONFIGURE_TARGET/libgcc/"
     if [ "$GCC_VERSION" = "4.6" -o "$GCC_VERSION" = "4.4.3" ]; then
        OBJS="unwind-c.o \
diff --git a/build/tools/build-gnu-libstdc++.sh b/build/tools/build-gnu-libstdc++.sh
index 397a1d34c..1c2d5bf49 100755
--- a/build/tools/build-gnu-libstdc++.sh
+++ b/build/tools/build-gnu-libstdc++.sh
@@ -342,7 +342,9 @@ copy_gnustl_libs ()
     esac
 
     LDIR=lib
-    if [ "$ARCH" != "${ARCH%%64*}" ]; then
+    if [ "$ABI" = "mips32r6" ]; then
+        LDIR=libr6
+    elif [ "$ARCH" != "${ARCH%%64*}" ]; then
         #Can't call $(get_default_libdir_for_arch $ARCH) which contain hack for arm64
         LDIR=lib64
     fi
@@ -443,7 +445,7 @@ if [ -n "$PACKAGE_DIR" ] ; then
                               lib64/libsupc++.a lib64/libgnustl_static.a lib64/libgnustl_shared.so
                               lib64r2/libsupc++.a lib64r2/libgnustl_static.a lib64r2/libgnustl_shared.so"
                     ;;
-                mips|mipsr6)
+                mips|mips32r6)
                     if [ "$VERSION" = "4.9" ]; then
                         MULTILIB="include/mips-r2/bits include/mips-r6/bits include/bits
                                   lib/libsupc++.a lib/libgnustl_static.a lib/libgnustl_shared.so
diff --git a/build/tools/build-llvm.sh b/build/tools/build-llvm.sh
index 53a5cf813..3a62af003 100755
--- a/build/tools/build-llvm.sh
+++ b/build/tools/build-llvm.sh
@@ -497,7 +497,7 @@ for ABI in $ABIS; do
       x86_64)
           LLVM_TARGET=x86_64-none-linux-android
           ;;
-      mips|mipsr6)
+      mips|mips32r6)
           LLVM_TARGET=mipsel-none-linux-android
           ;;
       mips64)
diff --git a/build/tools/build-target-prebuilts.sh b/build/tools/build-target-prebuilts.sh
index 7705ee347..d75cb0656 100755
--- a/build/tools/build-target-prebuilts.sh
+++ b/build/tools/build-target-prebuilts.sh
@@ -169,7 +169,7 @@ fail_panic "Could not build libc++ with libc++abi and debug info!"
 # workaround issues in libc++/libc++abi for x86 and mips
 for abi in $ABIS; do
   case $abi in
-     x86|x86_64|mips|mipsr6|mips64)
+     x86|x86_64|mips|mips32r6|mips64)
   dump "Rebuilding $abi libc++ binaries... with gabi++"
   run $BUILDTOOLS/build-cxx-stl.sh --stl=libc++-gabi++ --abis=$abi $FLAGS --with-debug-info $BUILD_TOOLCHAIN
   esac
diff --git a/build/tools/builder-funcs.sh b/build/tools/builder-funcs.sh
index 907f91796..273cfdbe7 100644
--- a/build/tools/builder-funcs.sh
+++ b/build/tools/builder-funcs.sh
@@ -598,7 +598,7 @@ builder_begin_android ()
             x86_64)
                 LLVM_TRIPLE=x86_64-none-linux-android
                 ;;
-            mips|mipsr6)
+            mips|mips32r6)
                 LLVM_TRIPLE=mipsel-none-linux-android
                 ;;
             mips64)
diff --git a/build/tools/dev-defaults.sh b/build/tools/dev-defaults.sh
index ee1ff2340..89b1f700f 100644
--- a/build/tools/dev-defaults.sh
+++ b/build/tools/dev-defaults.sh
@@ -150,7 +150,7 @@ get_default_abi_for_arch ()
         x86|x86_64|mips|mips64)
             RET="$1"
             ;;
-        mipsr6)
+        mips32r6)
             RET="mips"
             ;;
         *)
@@ -175,7 +175,7 @@ get_default_abis_for_arch ()
         arm64)
             RET="arm64-v8a"
             ;;
-        x86|x86_64|mips|mipsr6|mips64)
+        x86|x86_64|mips|mips32r6|mips64)
             RET="$1"
             ;;
         *)
diff --git a/build/tools/make-standalone-toolchain.sh b/build/tools/make-standalone-toolchain.sh
index b3f01396f..7d1be9ec2 100755
--- a/build/tools/make-standalone-toolchain.sh
+++ b/build/tools/make-standalone-toolchain.sh
@@ -714,7 +714,7 @@ copy_stl_libs_for_abi () {
                 copy_stl_libs "$ABI"
             fi
             ;;
-        mips|mipsr6)
+        mips|mips32r6)
             if [ "$STL" = "gnustl" -a "$GCC_VERSION" = "4.9" ]; then
                 copy_stl_libs mips         "bits"                "bits"             "../lib"       "lib"
                 copy_stl_libs mips         "mips-r2/bits"        "mips-r2/bits"     "../libr2"     "libr2"
diff --git a/build/tools/prebuilt-common.sh b/build/tools/prebuilt-common.sh
index f84e36033..90ef1e210 100644
--- a/build/tools/prebuilt-common.sh
+++ b/build/tools/prebuilt-common.sh
@@ -1327,7 +1327,7 @@ convert_abi_to_arch ()
         x86|mips|x86_64|mips64)
             RET=$ABI
             ;;
-        mipsr6)
+        mips32r6)
             RET=mips
             ;;
         arm64-v8a)
@@ -1495,7 +1495,7 @@ get_default_libdir_for_abi ()
     local ARCH
 
     case $1 in
-      mipsr6) echo "libr6" ;;
+      mips32r6) echo "libr6" ;;
       *)
         local ARCH=$(convert_abi_to_arch $1)
         echo "$(get_default_libdir_for_arch $ARCH)"