summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-08-28 23:22:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-28 23:22:53 -0700
commitd4f07cf5f30ea5eae0cfe25a13c9375f33a0eb12 (patch)
tree662739e8ef691b1b39dc4b5fda953648b7fa4fdf
parent9aaa620bdbb43b34d16ef81595ad1ffbcb3a863c (diff)
parentec4fa91327ed785809418cbf2c42560011bd8cab (diff)
am ec4fa913: am 87485cd8: am fcc2452b: Merge "Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S."
* commit 'ec4fa91327ed785809418cbf2c42560011bd8cab': Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S.
-rw-r--r--ndk/platforms/android-9/arch-mips/src/crtbegin_so.S19
-rw-r--r--ndk/platforms/android-9/arch-mips/src/crtend_so.S18
2 files changed, 0 insertions, 37 deletions
diff --git a/ndk/platforms/android-9/arch-mips/src/crtbegin_so.S b/ndk/platforms/android-9/arch-mips/src/crtbegin_so.S
index f4fc9b834..68dddfe3c 100644
--- a/ndk/platforms/android-9/arch-mips/src/crtbegin_so.S
+++ b/ndk/platforms/android-9/arch-mips/src/crtbegin_so.S
@@ -38,24 +38,7 @@ __FINI_ARRAY__:
.long -1
.long __do_global_dtors_aux
- .section .ctors, "aw"
- .type __CTOR_LIST__, @object
- .globl __CTOR_LIST__
-__CTOR_LIST__:
- .long -1
-
- .section .dtors, "aw"
- .type __DTOR_LIST__, @object
- .globl __DTOR_LIST__
-__DTOR_LIST__:
- .long -1
-
.abicalls
- .section .eh_frame,"a",@progbits
- .align 2
- .type __EH_FRAME_BEGIN__, @object
- .size __EH_FRAME_BEGIN__, 0
-__EH_FRAME_BEGIN__:
.text
.align 2
.set nomips16
@@ -105,8 +88,6 @@ $L8:
.size __do_global_dtors_aux, .-__do_global_dtors_aux
.local completed.1269
.comm completed.1269,1,1
- .local object.1265
- .comm object.1265,24,4
.weak __cxa_finalize
.include "__dso_handle.S"
diff --git a/ndk/platforms/android-9/arch-mips/src/crtend_so.S b/ndk/platforms/android-9/arch-mips/src/crtend_so.S
index d0bb0900f..f09c42708 100644
--- a/ndk/platforms/android-9/arch-mips/src/crtend_so.S
+++ b/ndk/platforms/android-9/arch-mips/src/crtend_so.S
@@ -3,21 +3,3 @@
.section .fini_array, "aw"
.long 0
-
- .section .ctors, "aw", @progbits
- .type __CTOR_END__, @object
-__CTOR_END__:
- .long 0
-
- .section .dtors, "aw", @progbits
- .type __DTOR_END__, @object
-__DTOR_END__:
- .long 0
-
- .section .eh_frame,"a",@progbits
- .align 4
- .type __FRAME_END__, @object
- .size __FRAME_END__, 4
-__FRAME_END__:
- .zero 4
-