runtime/cgo: rename crosscall_arm1 to crosscall1

This reduces inconsistency with other architectures and will allow
for further code deduplication.

Change-Id: Icf0d02f765546c3193cccaa22c79e632e12d6bba
Reviewed-on: https://go-review.googlesource.com/c/go/+/518616
Run-TryBot: Joel Sing <joel@sing.id.au>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>

diff --git a/src/runtime/cgo/gcc_arm.S b/src/runtime/cgo/gcc_arm.S
index 474fc23a39be3154827f3b2cee343e154338be25..3df8143aa72c089422830b184d3513a031823d1a 100644 (file)
--- a/src/runtime/cgo/gcc_arm.S
+++ b/src/runtime/cgo/gcc_arm.S
@@ -5,14 +5,14 @@
 .file "gcc_arm.S"
 
 /*
- * void crosscall_arm1(void (*fn)(void), void (*setg_gcc)(void *g), void *g)
+ * void crosscall1(void (*fn)(void), void (*setg_gcc)(void *g), void *g)
  *
- * Calling into the 5c tool chain, where all registers are caller save.
+ * Calling into the gc tool chain, where all registers are caller save.
  * Called from standard ARM EABI, where r4-r11 are callee-save, so they
  * must be saved explicitly.
  */
-.globl crosscall_arm1
-crosscall_arm1:
+.globl crosscall1
+crosscall1:
        push {r4, r5, r6, r7, r8, r9, r10, r11, ip, lr}
        mov r4, r0
        mov r5, r1

diff --git a/src/runtime/cgo/gcc_freebsd_arm.c b/src/runtime/cgo/gcc_freebsd_arm.c
index 3fcae03d51b347ebb1702cfc285cf6e46ce36da8..344531007c4212df0b5678de2ec145e76f583df3 100644 (file)
--- a/src/runtime/cgo/gcc_freebsd_arm.c
+++ b/src/runtime/cgo/gcc_freebsd_arm.c
@@ -56,7 +56,7 @@ _cgo_sys_thread_start(ThreadStart *ts)
        }
 }
 
-extern void crosscall_arm1(void (*fn)(void), void (*setg_gcc)(void*), void *g);
+extern void crosscall1(void (*fn)(void), void (*setg_gcc)(void*), void *g);
 static void*
 threadentry(void *v)
 {
@@ -65,6 +65,6 @@ threadentry(void *v)
        ts = *(ThreadStart*)v;
        free(v);
 
-       crosscall_arm1(ts.fn, setg_gcc, (void*)ts.g);
+       crosscall1(ts.fn, setg_gcc, (void*)ts.g);
        return nil;
 }

diff --git a/src/runtime/cgo/gcc_linux_arm.c b/src/runtime/cgo/gcc_linux_arm.c
index 6a7e3bea048c803c09f4ed8b772b5f285ee226c3..6ebb6c82f63211cf793544283d0bd9cbf36c7e64 100644 (file)
--- a/src/runtime/cgo/gcc_linux_arm.c
+++ b/src/runtime/cgo/gcc_linux_arm.c
@@ -38,7 +38,7 @@ _cgo_sys_thread_start(ThreadStart *ts)
        }
 }
 
-extern void crosscall_arm1(void (*fn)(void), void (*setg_gcc)(void*), void *g);
+extern void crosscall1(void (*fn)(void), void (*setg_gcc)(void*), void *g);
 static void*
 threadentry(void *v)
 {
@@ -47,7 +47,7 @@ threadentry(void *v)
        ts = *(ThreadStart*)v;
        free(v);
 
-       crosscall_arm1(ts.fn, setg_gcc, (void*)ts.g);
+       crosscall1(ts.fn, setg_gcc, (void*)ts.g);
        return nil;
 }
 

diff --git a/src/runtime/cgo/gcc_netbsd_arm.c b/src/runtime/cgo/gcc_netbsd_arm.c
index 13fb47df3bf439b54a963c1dadc677e827a77728..5f4e1fae4e7a97ecbc9298cd4a0047fd2581e589 100644 (file)
--- a/src/runtime/cgo/gcc_netbsd_arm.c
+++ b/src/runtime/cgo/gcc_netbsd_arm.c
@@ -46,7 +46,7 @@ _cgo_sys_thread_start(ThreadStart *ts)
        }
 }
 
-extern void crosscall_arm1(void (*fn)(void), void (*setg_gcc)(void*), void *g);
+extern void crosscall1(void (*fn)(void), void (*setg_gcc)(void*), void *g);
 static void*
 threadentry(void *v)
 {
@@ -67,6 +67,6 @@ threadentry(void *v)
        ss.ss_flags = SS_DISABLE;
        sigaltstack(&ss, nil);
 
-       crosscall_arm1(ts.fn, setg_gcc, (void*)ts.g);
+       crosscall1(ts.fn, setg_gcc, (void*)ts.g);
        return nil;
 }

diff --git a/src/runtime/cgo/gcc_openbsd_arm.c b/src/runtime/cgo/gcc_openbsd_arm.c
index b28f7faced5acd53e50a17f99cbd4750422b691d..457f71a19256cdb1652827380690e6354b57429b 100644 (file)
--- a/src/runtime/cgo/gcc_openbsd_arm.c
+++ b/src/runtime/cgo/gcc_openbsd_arm.c
@@ -45,7 +45,7 @@ _cgo_sys_thread_start(ThreadStart *ts)
        }
 }
 
-extern void crosscall_arm1(void (*fn)(void), void (*setg_gcc)(void*), void *g);
+extern void crosscall1(void (*fn)(void), void (*setg_gcc)(void*), void *g);
 
 static void*
 threadentry(void *v)
@@ -55,6 +55,6 @@ threadentry(void *v)
        ts = *(ThreadStart*)v;
        free(v);
 
-       crosscall_arm1(ts.fn, setg_gcc, (void*)ts.g);
+       crosscall1(ts.fn, setg_gcc, (void*)ts.g);
        return nil;
 }