Merge changes Iccb8a9fd,I073a67c4

* changes:
  Add /thumb libraries for gabi++/stlport/llvm-libc++
  Rename arch-x86_64/usr/lib to arch-x86_64/usr/lib64

39 files changed, 9 insertions, 0 deletions

diff --git a/8/sources/cxx-stl/gabi++/libs/armeabi-v7a/thumb/libgabi++_shared.so b/8/sources/cxx-stl/gabi++/libs/armeabi-v7a/thumb/libgabi++_shared.so
new file mode 120000
index 0000000..1967f70
--- /dev/null
+++ b/8/sources/cxx-stl/gabi++/libs/armeabi-v7a/thumb/libgabi++_shared.so
@@ -0,0 +1 @@
+../libgabi++_shared.so
\ No newline at end of file
diff --git a/8/sources/cxx-stl/gabi++/libs/armeabi-v7a/thumb/libgabi++_static.a b/8/sources/cxx-stl/gabi++/libs/armeabi-v7a/thumb/libgabi++_static.a
new file mode 120000
index 0000000..39fe2a2
--- /dev/null
+++ b/8/sources/cxx-stl/gabi++/libs/armeabi-v7a/thumb/libgabi++_static.a
@@ -0,0 +1 @@
+../libgabi++_static.a
\ No newline at end of file
diff --git a/8/sources/cxx-stl/gabi++/libs/armeabi/thumb/libgabi++_shared.so b/8/sources/cxx-stl/gabi++/libs/armeabi/thumb/libgabi++_shared.so
new file mode 120000
index 0000000..1967f70
--- /dev/null
+++ b/8/sources/cxx-stl/gabi++/libs/armeabi/thumb/libgabi++_shared.so
@@ -0,0 +1 @@
+../libgabi++_shared.so
\ No newline at end of file
diff --git a/8/sources/cxx-stl/gabi++/libs/armeabi/thumb/libgabi++_static.a b/8/sources/cxx-stl/gabi++/libs/armeabi/thumb/libgabi++_static.a
new file mode 120000
index 0000000..39fe2a2
--- /dev/null
+++ b/8/sources/cxx-stl/gabi++/libs/armeabi/thumb/libgabi++_static.a
@@ -0,0 +1 @@
+../libgabi++_static.a
\ No newline at end of file
diff --git a/8/sources/cxx-stl/stlport/libs/armeabi-v7a/thumb/libstlport_shared.so b/8/sources/cxx-stl/stlport/libs/armeabi-v7a/thumb/libstlport_shared.so
new file mode 120000
index 0000000..3544b52
--- /dev/null
+++ b/8/sources/cxx-stl/stlport/libs/armeabi-v7a/thumb/libstlport_shared.so
@@ -0,0 +1 @@
+../libstlport_shared.so
\ No newline at end of file
diff --git a/8/sources/cxx-stl/stlport/libs/armeabi-v7a/thumb/libstlport_static.a b/8/sources/cxx-stl/stlport/libs/armeabi-v7a/thumb/libstlport_static.a
new file mode 120000
index 0000000..d915b84
--- /dev/null
+++ b/8/sources/cxx-stl/stlport/libs/armeabi-v7a/thumb/libstlport_static.a
@@ -0,0 +1 @@
+../libstlport_static.a
\ No newline at end of file
diff --git a/8/sources/cxx-stl/stlport/libs/armeabi/thumb/libstlport_shared.so b/8/sources/cxx-stl/stlport/libs/armeabi/thumb/libstlport_shared.so
new file mode 120000
index 0000000..3544b52
--- /dev/null
+++ b/8/sources/cxx-stl/stlport/libs/armeabi/thumb/libstlport_shared.so
@@ -0,0 +1 @@
+../libstlport_shared.so
\ No newline at end of file
diff --git a/8/sources/cxx-stl/stlport/libs/armeabi/thumb/libstlport_static.a b/8/sources/cxx-stl/stlport/libs/armeabi/thumb/libstlport_static.a
new file mode 120000
index 0000000..d915b84
--- /dev/null
+++ b/8/sources/cxx-stl/stlport/libs/armeabi/thumb/libstlport_static.a
@@ -0,0 +1 @@
+../libstlport_static.a
\ No newline at end of file
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib b/9/platforms/android-19/arch-x86_64/usr/lib
new file mode 120000
index 0000000..6b60c32
--- /dev/null
+++ b/9/platforms/android-19/arch-x86_64/usr/lib
@@ -0,0 +1 @@
+lib64
\ No newline at end of file
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/crtbegin_dynamic.o b/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_dynamic.o
index 03cbdea..03cbdea 100644
--- a/9/platforms/android-19/arch-x86_64/usr/lib/crtbegin_dynamic.o
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_dynamic.o
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/crtbegin_so.o b/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_so.o
index d6768bf..d6768bf 100644
--- a/9/platforms/android-19/arch-x86_64/usr/lib/crtbegin_so.o
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_so.o
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/crtbegin_static.o b/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_static.o
index 03cbdea..03cbdea 100644
--- a/9/platforms/android-19/arch-x86_64/usr/lib/crtbegin_static.o
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_static.o
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/crtend_android.o b/9/platforms/android-19/arch-x86_64/usr/lib64/crtend_android.o
index 2149bf1..2149bf1 100644
--- a/9/platforms/android-19/arch-x86_64/usr/lib/crtend_android.o
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/crtend_android.o
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/crtend_so.o b/9/platforms/android-19/arch-x86_64/usr/lib64/crtend_so.o
index e0041da..e0041da 100644
--- a/9/platforms/android-19/arch-x86_64/usr/lib/crtend_so.o
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/crtend_so.o
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libEGL.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libEGL.so
index da6d74e..da6d74e 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib/libEGL.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libEGL.so
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libGLESv1_CM.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv1_CM.so
index 16a7659..16a7659 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib/libGLESv1_CM.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv1_CM.so
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libGLESv2.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv2.so
index 57104ab..57104ab 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib/libGLESv2.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv2.so
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libGLESv3.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv3.so
index 70c97cb..70c97cb 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib/libGLESv3.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv3.so
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libOpenMAXAL.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libOpenMAXAL.so
index ac27304..ac27304 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib/libOpenMAXAL.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libOpenMAXAL.so
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libOpenSLES.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libOpenSLES.so
index 95ecb48..95ecb48 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib/libOpenSLES.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libOpenSLES.so
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libandroid.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libandroid.so
index a7a40ef..a7a40ef 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib/libandroid.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libandroid.so
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libc.a b/9/platforms/android-19/arch-x86_64/usr/lib64/libc.a
index 58c1a03..58c1a03 100644
--- a/9/platforms/android-19/arch-x86_64/usr/lib/libc.a
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libc.a
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libc.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libc.so
index 24fac15..24fac15 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib/libc.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libc.so
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libdl.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libdl.so
index afeda71..afeda71 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib/libdl.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libdl.so
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libjnigraphics.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libjnigraphics.so
index 0ba220e..0ba220e 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib/libjnigraphics.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libjnigraphics.so
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/liblog.so b/9/platforms/android-19/arch-x86_64/usr/lib64/liblog.so
index 007044d..007044d 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib/liblog.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/liblog.so
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libm.a b/9/platforms/android-19/arch-x86_64/usr/lib64/libm.a
index 0fd1900..0fd1900 100644
--- a/9/platforms/android-19/arch-x86_64/usr/lib/libm.a
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libm.a
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libm.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libm.so
index d07c215..d07c215 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib/libm.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libm.so
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libstdc++.a b/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.a
index 91b8ae2..91b8ae2 100644
--- a/9/platforms/android-19/arch-x86_64/usr/lib/libstdc++.a
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.a
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libstdc++.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.so
index 9fa5287..9fa5287 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib/libstdc++.so
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.so
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libz.a b/9/platforms/android-19/arch-x86_64/usr/lib64/libz.a
index a715308..a715308 100644
--- a/9/platforms/android-19/arch-x86_64/usr/lib/libz.a
+++ b/9/platforms/android-19/arch-x86_64/usr/lib64/libz.a
diff --git a/9/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_shared.so b/9/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_shared.so
index a18ab24..11e2864 100755
--- a/9/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_shared.so
+++ b/9/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_shared.so
diff --git a/9/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_static.a b/9/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_static.a
index 9b2b097..38191cb 100644
--- a/9/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_static.a
+++ b/9/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_static.a
diff --git a/9/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/thumb/libc++_shared.so b/9/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/thumb/libc++_shared.so
new file mode 100755
index 0000000..3af2ada
--- /dev/null
+++ b/9/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/thumb/libc++_shared.so
diff --git a/9/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/thumb/libc++_static.a b/9/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/thumb/libc++_static.a
new file mode 100644
index 0000000..9229848
--- /dev/null
+++ b/9/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/thumb/libc++_static.a
diff --git a/9/sources/cxx-stl/llvm-libc++/libs/armeabi/libc++_shared.so b/9/sources/cxx-stl/llvm-libc++/libs/armeabi/libc++_shared.so
index ce6ba41..5300f35 100755
--- a/9/sources/cxx-stl/llvm-libc++/libs/armeabi/libc++_shared.so
+++ b/9/sources/cxx-stl/llvm-libc++/libs/armeabi/libc++_shared.so
diff --git a/9/sources/cxx-stl/llvm-libc++/libs/armeabi/libc++_static.a b/9/sources/cxx-stl/llvm-libc++/libs/armeabi/libc++_static.a
index fd46442..6f546be 100644
--- a/9/sources/cxx-stl/llvm-libc++/libs/armeabi/libc++_static.a
+++ b/9/sources/cxx-stl/llvm-libc++/libs/armeabi/libc++_static.a
diff --git a/9/sources/cxx-stl/llvm-libc++/libs/armeabi/thumb/libc++_shared.so b/9/sources/cxx-stl/llvm-libc++/libs/armeabi/thumb/libc++_shared.so
new file mode 100755
index 0000000..3f785ff
--- /dev/null
+++ b/9/sources/cxx-stl/llvm-libc++/libs/armeabi/thumb/libc++_shared.so
diff --git a/9/sources/cxx-stl/llvm-libc++/libs/armeabi/thumb/libc++_static.a b/9/sources/cxx-stl/llvm-libc++/libs/armeabi/thumb/libc++_static.a
new file mode 100644
index 0000000..02af75c
--- /dev/null
+++ b/9/sources/cxx-stl/llvm-libc++/libs/armeabi/thumb/libc++_static.a