commit 81d31925a93efab1376f6354f67b7773dadc6d49
author Nick Bray <ncbray@google.com> Mon Jun 18 14:45:53 2018 -0700
committer Nick Bray <ncbray@google.com> Wed Jun 20 10:20:23 2018 -0700
tree ed747933fc34b9391e1784547aba23ed38319465
parent c554fa5a5a059de9d3dcb645de6cac3a330d123d

[lib][syscall] Prefix syscall stubs with _trusty_*.

This makes it easier to wrap the syscalls in libc.

Bug: 110159511
Change-Id: I9444104fc2fe1034dc38f51239481aa20e3d8dbb

lib/syscall/stubgen/stubgen.py

diff --git a/lib/syscall/stubgen/stubgen.py b/lib/syscall/stubgen/stubgen.py
index 6f653ce..f1b405c 100755
--- a/lib/syscall/stubgen/stubgen.py
+++ b/lib/syscall/stubgen/stubgen.py
@@ -97,15 +97,15 @@
 arch_dict = {
     "arm" : Architecture (
         syscall_stub = """
-.section .text.%(sys_fn)s
-FUNCTION(%(sys_fn)s)
+.section .text._trusty_%(sys_fn)s
+FUNCTION(_trusty_%(sys_fn)s)
     ldr     r12, =__NR_%(sys_fn)s
     swi     #0
     bx      lr
 """),
     "x86_64" : Architecture (
         syscall_stub = """
-FUNCTION(%(sys_fn)s)
+FUNCTION(_trusty_%(sys_fn)s)
     pushfq
     pushq %%rbp
     pushq %%rbx
@@ -125,7 +125,7 @@
 
 syscall_define = "#define __NR_%(sys_fn)s\t\t%(sys_nr)s\n"
 
-syscall_proto = "%(sys_rt)s %(sys_fn)s (%(sys_args)s);\n"
+syscall_proto = "%(sys_rt)s _trusty_%(sys_fn)s(%(sys_args)s);\n"
 
 asm_ifdef = "\n#ifndef ASSEMBLY\n"
 asm_endif = "\n#endif\n"