update Android build

diff --git a/Android.mk b/Android.mk
index 5b0680bc3cfd52c9cce6a91eb78b8a15cd149923..0b24bae1f0abe5791498a97ecff874d49da65f8a 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -16,17 +16,14 @@ LOCAL_SRC_FILES := \
        src/sat.cc \
        src/sat_factory.cc \
        src/worker.cc
+
+# just build a 32b version, even on 64b hosts
+LOCAL_MULTILIB := 32
 LOCAL_MODULE:= stressapptest
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_CFLAGS := -DHAVE_CONFIG_H -DANDROID -DNDEBUG -UDEBUG -DCHECKOPTS
 
-LOCAL_C_INCLUDES := \
-       bionic \
-       external/stlport/stlport
-
 LOCAL_CPP_EXTENSION := .cc
 
-LOCAL_SHARED_LIBRARIES := libc libstlport
-
 include $(BUILD_EXECUTABLE)

diff --git a/src/adler32memcpy.cc b/src/adler32memcpy.cc
index 47c62628f512ea0d09db5554a92a0ba8f4cd479d..c0c6a391abc02b807da79fd58548b400d8128854 100644 (file)
--- a/src/adler32memcpy.cc
+++ b/src/adler32memcpy.cc
@@ -423,22 +423,22 @@ bool AdlerMemcpyAsm(uint64 *dstmem64, uint64 *srcmem64,
   #define crc_r "r6"
 
   asm volatile (
-      "mov "src_r", %[src];            \n"
-      "mov "dst_r", %[dst];            \n"
-      "mov "crc_r", %[crc];            \n"
-      "mov "blocks_r", %[blocks];      \n"
+      "mov " src_r ", %[src];          \n"
+      "mov " dst_r ", %[dst];          \n"
+      "mov " crc_r ", %[crc];          \n"
+      "mov " blocks_r ", %[blocks];    \n"
 
       // Loop over block count.
-      "cmp "blocks_r", #0;     \n"   // Compare counter to zero.
+      "cmp " blocks_r ", #0;   \n"   // Compare counter to zero.
       "ble END;                        \n"
 
 
       // Preload upcoming cacheline.
-      "pld ["src_r", #0x0];    \n"
-      "pld ["src_r", #0x20];   \n"
+      "pld [" src_r ", #0x0];  \n"
+      "pld [" src_r ", #0x20]; \n"
 
       // Init checksum
-      "vldm "crc_r", {q0};             \n"
+      "vldm " crc_r ", {q0};           \n"
       "vmov.i32 q1, #0;                        \n"
 
       // Start of the loop which copies 48 bytes from source to dst each time.
@@ -448,8 +448,8 @@ bool AdlerMemcpyAsm(uint64 *dstmem64, uint64 *srcmem64,
       // We are using 2 words out of 4 words in each qX register,
       // word index 0 and word index 2. We'll swizzle them in a bit.
       // Copy it.
-      "vldm "src_r"!, {q8, q9, q10, q11};      \n"
-      "vstm "dst_r"!, {q8, q9, q10, q11};      \n"
+      "vldm " src_r "!, {q8, q9, q10, q11};    \n"
+      "vstm " dst_r "!, {q8, q9, q10, q11};    \n"
 
       // Arrange it.
       "vmov.i64 q12, #0;       \n"
@@ -487,8 +487,8 @@ bool AdlerMemcpyAsm(uint64 *dstmem64, uint64 *srcmem64,
       "vadd.i64 q1, q1, q0;    \n"
 
       // Increment counter and loop.
-      "sub "blocks_r", "blocks_r", #1; \n"
-      "cmp "blocks_r", #0;     \n"   // Compare counter to zero.
+      "sub " blocks_r ", " blocks_r ", #1;     \n"
+      "cmp " blocks_r ", #0;   \n"   // Compare counter to zero.
       "bgt TOP;        \n"
 
 
@@ -497,7 +497,7 @@ bool AdlerMemcpyAsm(uint64 *dstmem64, uint64 *srcmem64,
       // 64 bit numbers and have to be converted to 64 bit numbers)
       // seems like Adler128 (since size of each part is 4 byte rather than
       // 1 byte).
-      "vstm "crc_r", {q0, q1}; \n"
+      "vstm " crc_r ", {q0, q1};       \n"
 
       // Output registers.
       :

diff --git a/src/stressapptest_config_android.h b/src/stressapptest_config_android.h
index 83a48660b1cac21e7a895464e8299177cb24ac41..0f6718e7bda6cc891931b7c1846e5163b7fcb27b 100644 (file)
--- a/src/stressapptest_config_android.h
+++ b/src/stressapptest_config_android.h
@@ -52,7 +52,7 @@
 #define HAVE_NETDB_H 1
 
 /* Define to 1 if you have the `posix_memalign' function. */
-/* #undef HAVE_POSIX_MEMALIGN */
+#define HAVE_POSIX_MEMALIGN 1
 
 /* Define to 1 if you have the <pthread.h> header file. */
 #define HAVE_PTHREAD_H 1

diff --git a/src/worker.cc b/src/worker.cc
index 0864661f2892f663482e39bf1306718c4f523083..5b0fe5917f1d5055125a9eedb0d88b7a7537d4a6 100644 (file)
--- a/src/worker.cc
+++ b/src/worker.cc
@@ -2056,7 +2056,7 @@ bool NetworkListenThread::Listen() {
   sa.sin_addr.s_addr = INADDR_ANY;
   sa.sin_port = htons(kNetworkPort);
 
-  if (-1 == bind(sock_, (struct sockaddr*)&sa, sizeof(struct sockaddr))) {
+  if (-1 == ::bind(sock_, (struct sockaddr*)&sa, sizeof(struct sockaddr))) {
     char buf[256];
     sat_strerror(errno, buf, sizeof(buf));
     logprintf(0, "Process Error: Cannot bind socket: %s\n", buf);