From db5eb2a2c3290fa2bd26bd8da2356edbdb32a75a Mon Sep 17 00:00:00 2001 From: "Hyang-Ah (Hana) Kim" Date: Thu, 13 Aug 2015 09:05:22 -0400 Subject: [PATCH] runtime/cgo: remove __stack_chk_fail_local I cannot find where it's being used. This addresses a duplicate symbol issue encountered in golang/go#9327. Change-Id: I8efda45a006ad3e19423748210c78bd5831215e0 Reviewed-on: https://go-review.googlesource.com/13615 Reviewed-by: Ian Lance Taylor --- src/runtime/cgo/gcc_386.S | 5 ----- src/runtime/cgo/gcc_arm.S | 4 ---- src/runtime/cgo/gcc_arm64.S | 4 ---- src/runtime/cgo/gcc_ppc64x.S | 5 ----- 4 files changed, 18 deletions(-) diff --git a/src/runtime/cgo/gcc_386.S b/src/runtime/cgo/gcc_386.S index bf4142793c..ff11ce1208 100644 --- a/src/runtime/cgo/gcc_386.S +++ b/src/runtime/cgo/gcc_386.S @@ -35,11 +35,6 @@ EXT(crosscall_386): popl %ebp ret -.globl EXT(__stack_chk_fail_local) -EXT(__stack_chk_fail_local): -1: - jmp 1b - #ifdef __ELF__ .section .note.GNU-stack,"",@progbits #endif diff --git a/src/runtime/cgo/gcc_arm.S b/src/runtime/cgo/gcc_arm.S index 980ab579e4..d2252982d8 100644 --- a/src/runtime/cgo/gcc_arm.S +++ b/src/runtime/cgo/gcc_arm.S @@ -36,10 +36,6 @@ EXT(crosscall_arm1): pop {r4, r5, r6, r7, r8, r9, r10, r11, ip, pc} -.globl EXT(__stack_chk_fail_local) -EXT(__stack_chk_fail_local): -1: - b 1b #ifdef __ELF__ .section .note.GNU-stack,"",%progbits diff --git a/src/runtime/cgo/gcc_arm64.S b/src/runtime/cgo/gcc_arm64.S index b7379d1013..d9da2722e6 100644 --- a/src/runtime/cgo/gcc_arm64.S +++ b/src/runtime/cgo/gcc_arm64.S @@ -47,10 +47,6 @@ EXT(crosscall1): ldp x19, x20, [sp], #16 ret -.globl EXT(__stack_chk_fail_local) -EXT(__stack_chk_fail_local): -1: - b 1b #ifdef __ELF__ .section .note.GNU-stack,"",%progbits diff --git a/src/runtime/cgo/gcc_ppc64x.S b/src/runtime/cgo/gcc_ppc64x.S index 05af070f94..682349b2ab 100644 --- a/src/runtime/cgo/gcc_ppc64x.S +++ b/src/runtime/cgo/gcc_ppc64x.S @@ -129,11 +129,6 @@ restoreregs: blr -.globl EXT(__stack_chk_fail_local) -EXT(__stack_chk_fail_local): -1: - // TODO(austin) - b 1b #ifdef __ELF__ .section .note.GNU-stack,"",%progbits -- 2.48.1