Merge "Fix end pointer size/alignment of crtend_* for mips64 and x86_64"

ndk/platforms/android-21/arch-mips/libr2

@@ -0,0 +1 @@
+lib

ndk/platforms/android-21/arch-mips/libr6

@@ -0,0 +1 @@
+../arch-mips64/libr6

ndk/platforms/android-21/arch-mips64/src/asm_multiarch.h

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifdef __LP64__
+# define ASM_PTR_SIZE(x) .quad x
+# define ASM_ALIGN_TO_PTR_SIZE .balign 8
+#else
+# define ASM_PTR_SIZE(x) .long x
+# define ASM_ALIGN_TO_PTR_SIZE .balign 4
+#endif
+

ndk/platforms/android-21/arch-mips64/src/crtend_android.S

@@ -25,25 +25,30 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-	
+
+#include "asm_multiarch.h"
+
 	.section .preinit_array, "aw"
-	.long 0
+	ASM_ALIGN_TO_PTR_SIZE
+	ASM_PTR_SIZE(0)
 
 	.section .init_array, "aw"
-	.long 0
+	ASM_ALIGN_TO_PTR_SIZE
+	ASM_PTR_SIZE(0)
 
 	.section .fini_array, "aw"
-	.long 0
+	ASM_ALIGN_TO_PTR_SIZE
+	ASM_PTR_SIZE(0)
 
 	.section .ctors, "aw"
 	.type __CTOR_END__, @object
 __CTOR_END__:
-	.long 0
+	ASM_PTR_SIZE(0)
 
 	.section .dtors, "aw"
 	.type __DTOR_END__, @object
 __DTOR_END__:
-	.long 0
+	ASM_PTR_SIZE(0)
 
 	.section	.eh_frame,"a",@progbits
 	.align 4

ndk/platforms/android-21/arch-mips64/src/crtend_so.S

@@ -1,5 +1,9 @@
+#include "asm_multiarch.h"
+
 	.section .init_array, "aw"
-	.long 0
+	ASM_ALIGN_TO_PTR_SIZE
+	ASM_PTR_SIZE(0)
 
 	.section .fini_array, "aw"
-	.long 0
+	ASM_ALIGN_TO_PTR_SIZE
+	ASM_PTR_SIZE(0)

ndk/platforms/android-9/arch-x86/src/asm_multiarch.h

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifdef __LP64__
+# define ASM_PTR_SIZE(x) .quad x
+# define ASM_ALIGN_TO_PTR_SIZE .balign 8
+#else
+# define ASM_PTR_SIZE(x) .long x
+# define ASM_ALIGN_TO_PTR_SIZE .balign 4
+#endif
+

ndk/platforms/android-9/arch-x86/src/crtend.S

@@ -1,11 +1,16 @@
+#include "asm_multiarch.h"
+
 	.section .preinit_array, "aw"
-	.long 0
+	ASM_ALIGN_TO_PTR_SIZE
+	ASM_PTR_SIZE(0)
 
 	.section .init_array, "aw"
-	.long 0
+	ASM_ALIGN_TO_PTR_SIZE
+	ASM_PTR_SIZE(0)
 
 	.section .fini_array, "aw"
-	.long 0
+	ASM_ALIGN_TO_PTR_SIZE
+	ASM_PTR_SIZE(0)
 
 	.section	.eh_frame,"a",@progbits
 	.align 4

ndk/platforms/android-9/arch-x86/src/crtend_so.S

@@ -1,8 +1,12 @@
-.section .init_array, "aw"
-    .long 0
+#include "asm_multiarch.h"
 
-.section .fini_array, "aw"
-    .long 0
+	.section .init_array, "aw"
+	ASM_ALIGN_TO_PTR_SIZE
+	ASM_PTR_SIZE(0)
+
+	.section .fini_array, "aw"
+	ASM_ALIGN_TO_PTR_SIZE
+	ASM_PTR_SIZE(0)
 
 	.section	.eh_frame,"a",@progbits
 	.align 4