rt: Namespace all C functions under rust_

6 files changed, 16 insertions, 16 deletions

diff --git a/src/rt/arch/arm/_context.S b/src/rt/arch/arm/_context.S
index 7227c15cc47..4ab463d968e 100644
--- a/src/rt/arch/arm/_context.S
+++ b/src/rt/arch/arm/_context.S
@@ -12,8 +12,8 @@
 .align
 #endif
 
-.globl swap_registers
-swap_registers:
+.globl rust_swap_registers
+rust_swap_registers:
 	str r0, [r0, #0]
 	str r3, [r0, #12]
 	str r4, [r0, #16]
diff --git a/src/rt/arch/i386/_context.S b/src/rt/arch/i386/_context.S
index e2e4ffe35b4..6b79a82e4ac 100644
--- a/src/rt/arch/i386/_context.S
+++ b/src/rt/arch/i386/_context.S
@@ -21,9 +21,9 @@ The registers_t variable is in (%esp)
 */
 
 #if defined(__APPLE__) || defined(_WIN32)
-#define SWAP_REGISTERS _swap_registers
+#define SWAP_REGISTERS _rust_swap_registers
 #else
-#define SWAP_REGISTERS swap_registers
+#define SWAP_REGISTERS rust_swap_registers
 #endif
 
 // swap_registers(registers_t *oregs, registers_t *regs)
diff --git a/src/rt/arch/mips/_context.S b/src/rt/arch/mips/_context.S
index 6d8207d97d0..cfe77cc3045 100644
--- a/src/rt/arch/mips/_context.S
+++ b/src/rt/arch/mips/_context.S
@@ -4,11 +4,11 @@
 #endif
 
 .text
-.globl swap_registers
+.globl rust_swap_registers
 .align 2
 .set nomips16
-.ent swap_registers
-swap_registers:
+.ent rust_swap_registers
+rust_swap_registers:
         .set noreorder
         .set nomacro
         .set noat
@@ -85,4 +85,4 @@ swap_registers:
 
         jr $31
         nop
-.end swap_registers
+.end rust_swap_registers
diff --git a/src/rt/arch/x86_64/_context.S b/src/rt/arch/x86_64/_context.S
index a53b1c2d737..74f20650f30 100644
--- a/src/rt/arch/x86_64/_context.S
+++ b/src/rt/arch/x86_64/_context.S
@@ -55,9 +55,9 @@ First four arguments:
 */
 
 #if defined(__APPLE__)
-#define SWAP_REGISTERS _swap_registers
+#define SWAP_REGISTERS _rust_swap_registers
 #else
-#define SWAP_REGISTERS swap_registers
+#define SWAP_REGISTERS rust_swap_registers
 #endif
 
 // swap_registers(registers_t *oregs, registers_t *regs)
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp
index 4c1c6a7202a..7d75d557bf7 100644
--- a/src/rt/rust_builtin.cpp
+++ b/src/rt/rust_builtin.cpp
@@ -168,7 +168,7 @@ extern "C" CDECL FILE* rust_get_stderr() {return stderr;}
 
 #if defined(__WIN32__)
 extern "C" CDECL void
-get_time(int64_t *sec, int32_t *nsec) {
+rust_get_time(int64_t *sec, int32_t *nsec) {
     FILETIME fileTime;
     GetSystemTimeAsFileTime(&fileTime);
 
@@ -187,7 +187,7 @@ get_time(int64_t *sec, int32_t *nsec) {
 }
 #else
 extern "C" CDECL void
-get_time(int64_t *sec, int32_t *nsec) {
+rust_get_time(int64_t *sec, int32_t *nsec) {
 #ifdef __APPLE__
     struct timeval tv;
     gettimeofday(&tv, NULL);
@@ -205,7 +205,7 @@ get_time(int64_t *sec, int32_t *nsec) {
 const int64_t ns_per_s = 1000000000LL;
 
 extern "C" CDECL void
-precise_time_ns(uint64_t *ns) {
+rust_precise_time_ns(uint64_t *ns) {
 
 #ifdef __APPLE__
     uint64_t time = mach_absolute_time();
diff --git a/src/rt/rustrt.def.in b/src/rt/rustrt.def.in
index 1f440047d4e..49b6ebce284 100644
--- a/src/rt/rustrt.def.in
+++ b/src/rt/rustrt.def.in
@@ -2,13 +2,13 @@ rust_dbg_abi_1
 rust_dbg_abi_2
 rust_dbg_static_mut
 rust_dbg_static_mut_check_four
-get_time
+rust_get_time
 rust_tzset
 rust_gmtime
 rust_localtime
 rust_timegm
 rust_mktime
-precise_time_ns
+rust_precise_time_ns
 rust_path_is_dir
 rust_path_is_dir_u16
 rust_path_exists
@@ -43,7 +43,7 @@ rust_signal_little_lock
 rust_wait_little_lock
 tdefl_compress_mem_to_heap
 tinfl_decompress_mem_to_heap
-swap_registers
+rust_swap_registers
 rust_readdir
 rust_opendir
 rust_dbg_extern_identity_u32