am f5e0ba94: Merge "Make gensyscalls.py use the ALIAS_SYMBOL macro."

* commit 'f5e0ba94d911ef2622ecfd3f7fabc4432a4806d3': Make gensyscalls.py use the ALIAS_SYMBOL macro.
2015-03-25 04:31:15 +00:00 · 2015-03-25 04:31:15 +00:00 · 44a6dcc2a4
commit 44a6dcc2a4
parent 26bca5b140 f5e0ba94d9
50 changed files with 50 additions and 105 deletions
--- a/libc/arch-arm/syscalls/_exit.S
+++ b/libc/arch-arm/syscalls/_exit.S
@ -13,5 +13,4 @@ ENTRY(_exit)
    b       __set_errno_internal
 END(_exit)

-    .globl _Exit
-    .equ _Exit, _exit
+ALIAS_SYMBOL(_Exit, _exit)
--- a/libc/arch-arm/syscalls/fstat64.S
+++ b/libc/arch-arm/syscalls/fstat64.S
@ -13,5 +13,4 @@ ENTRY(fstat64)
    b       __set_errno_internal
 END(fstat64)

-    .globl fstat
-    .equ fstat, fstat64
+ALIAS_SYMBOL(fstat, fstat64)
--- a/libc/arch-arm/syscalls/fstatat64.S
+++ b/libc/arch-arm/syscalls/fstatat64.S
@ -13,5 +13,4 @@ ENTRY(fstatat64)
    b       __set_errno_internal
 END(fstatat64)

-    .globl fstatat
-    .equ fstatat, fstatat64
+ALIAS_SYMBOL(fstatat, fstatat64)
--- a/libc/arch-arm64/syscalls/_exit.S
+++ b/libc/arch-arm64/syscalls/_exit.S
@ -13,5 +13,4 @@ ENTRY(_exit)
    ret
 END(_exit)

-    .globl _Exit
-    .equ _Exit, _exit
+ALIAS_SYMBOL(_Exit, _exit)
--- a/libc/arch-arm64/syscalls/fallocate.S
+++ b/libc/arch-arm64/syscalls/fallocate.S
@ -13,5 +13,4 @@ ENTRY(fallocate)
    ret
 END(fallocate)

-    .globl fallocate64
-    .equ fallocate64, fallocate
+ALIAS_SYMBOL(fallocate64, fallocate)
--- a/libc/arch-arm64/syscalls/fstat64.S
+++ b/libc/arch-arm64/syscalls/fstat64.S
@ -13,5 +13,4 @@ ENTRY(fstat64)
    ret
 END(fstat64)

-    .globl fstat
-    .equ fstat, fstat64
+ALIAS_SYMBOL(fstat, fstat64)
--- a/libc/arch-arm64/syscalls/fstatat64.S
+++ b/libc/arch-arm64/syscalls/fstatat64.S
@ -13,5 +13,4 @@ ENTRY(fstatat64)
    ret
 END(fstatat64)

-    .globl fstatat
-    .equ fstatat, fstatat64
+ALIAS_SYMBOL(fstatat, fstatat64)
--- a/libc/arch-arm64/syscalls/ftruncate.S
+++ b/libc/arch-arm64/syscalls/ftruncate.S
@ -13,5 +13,4 @@ ENTRY(ftruncate)
    ret
 END(ftruncate)

-    .globl ftruncate64
-    .equ ftruncate64, ftruncate
+ALIAS_SYMBOL(ftruncate64, ftruncate)
--- a/libc/arch-arm64/syscalls/getrlimit.S
+++ b/libc/arch-arm64/syscalls/getrlimit.S
@ -13,5 +13,4 @@ ENTRY(getrlimit)
    ret
 END(getrlimit)

-    .globl getrlimit64
-    .equ getrlimit64, getrlimit
+ALIAS_SYMBOL(getrlimit64, getrlimit)
--- a/libc/arch-arm64/syscalls/lseek.S
+++ b/libc/arch-arm64/syscalls/lseek.S
@ -13,5 +13,4 @@ ENTRY(lseek)
    ret
 END(lseek)

-    .globl lseek64
-    .equ lseek64, lseek
+ALIAS_SYMBOL(lseek64, lseek)
--- a/libc/arch-arm64/syscalls/mmap.S
+++ b/libc/arch-arm64/syscalls/mmap.S
@ -13,5 +13,4 @@ ENTRY(mmap)
    ret
 END(mmap)

-    .globl mmap64
-    .equ mmap64, mmap
+ALIAS_SYMBOL(mmap64, mmap)
--- a/libc/arch-arm64/syscalls/pread64.S
+++ b/libc/arch-arm64/syscalls/pread64.S
@ -13,5 +13,4 @@ ENTRY(pread64)
    ret
 END(pread64)

-    .globl pread
-    .equ pread, pread64
+ALIAS_SYMBOL(pread, pread64)
--- a/libc/arch-arm64/syscalls/prlimit64.S
+++ b/libc/arch-arm64/syscalls/prlimit64.S
@ -13,5 +13,4 @@ ENTRY(prlimit64)
    ret
 END(prlimit64)

-    .globl prlimit
-    .equ prlimit, prlimit64
+ALIAS_SYMBOL(prlimit, prlimit64)
--- a/libc/arch-arm64/syscalls/pwrite64.S
+++ b/libc/arch-arm64/syscalls/pwrite64.S
@ -13,5 +13,4 @@ ENTRY(pwrite64)
    ret
 END(pwrite64)

-    .globl pwrite
-    .equ pwrite, pwrite64
+ALIAS_SYMBOL(pwrite, pwrite64)
--- a/libc/arch-arm64/syscalls/sendfile.S
+++ b/libc/arch-arm64/syscalls/sendfile.S
@ -13,5 +13,4 @@ ENTRY(sendfile)
    ret
 END(sendfile)

-    .globl sendfile64
-    .equ sendfile64, sendfile
+ALIAS_SYMBOL(sendfile64, sendfile)
--- a/libc/arch-arm64/syscalls/setrlimit.S
+++ b/libc/arch-arm64/syscalls/setrlimit.S
@ -13,5 +13,4 @@ ENTRY(setrlimit)
    ret
 END(setrlimit)

-    .globl setrlimit64
-    .equ setrlimit64, setrlimit
+ALIAS_SYMBOL(setrlimit64, setrlimit)
--- a/libc/arch-arm64/syscalls/truncate.S
+++ b/libc/arch-arm64/syscalls/truncate.S
@ -13,5 +13,4 @@ ENTRY(truncate)
    ret
 END(truncate)

-    .globl truncate64
-    .equ truncate64, truncate
+ALIAS_SYMBOL(truncate64, truncate)
--- a/libc/arch-mips/syscalls/_exit.S
+++ b/libc/arch-mips/syscalls/_exit.S
@ -18,5 +18,4 @@ ENTRY(_exit)
    .set reorder
 END(_exit)

-    .globl _Exit
-    .equ _Exit, _exit
+ALIAS_SYMBOL(_Exit, _exit)
--- a/libc/arch-mips/syscalls/fstat64.S
+++ b/libc/arch-mips/syscalls/fstat64.S
@ -18,5 +18,4 @@ ENTRY(fstat64)
    .set reorder
 END(fstat64)

-    .globl fstat
-    .equ fstat, fstat64
+ALIAS_SYMBOL(fstat, fstat64)
--- a/libc/arch-mips/syscalls/fstatat64.S
+++ b/libc/arch-mips/syscalls/fstatat64.S
@ -18,5 +18,4 @@ ENTRY(fstatat64)
    .set reorder
 END(fstatat64)

-    .globl fstatat
-    .equ fstatat, fstatat64
+ALIAS_SYMBOL(fstatat, fstatat64)
--- a/libc/arch-mips64/syscalls/_exit.S
+++ b/libc/arch-mips64/syscalls/_exit.S
@ -24,5 +24,4 @@ ENTRY(_exit)
    .set pop
 END(_exit)

-    .globl _Exit
-    .equ _Exit, _exit
+ALIAS_SYMBOL(_Exit, _exit)
--- a/libc/arch-mips64/syscalls/fallocate.S
+++ b/libc/arch-mips64/syscalls/fallocate.S
@ -24,5 +24,4 @@ ENTRY(fallocate)
    .set pop
 END(fallocate)

-    .globl fallocate64
-    .equ fallocate64, fallocate
+ALIAS_SYMBOL(fallocate64, fallocate)
--- a/libc/arch-mips64/syscalls/ftruncate.S
+++ b/libc/arch-mips64/syscalls/ftruncate.S
@ -24,5 +24,4 @@ ENTRY(ftruncate)
    .set pop
 END(ftruncate)

-    .globl ftruncate64
-    .equ ftruncate64, ftruncate
+ALIAS_SYMBOL(ftruncate64, ftruncate)
--- a/libc/arch-mips64/syscalls/getrlimit.S
+++ b/libc/arch-mips64/syscalls/getrlimit.S
@ -24,5 +24,4 @@ ENTRY(getrlimit)
    .set pop
 END(getrlimit)

-    .globl getrlimit64
-    .equ getrlimit64, getrlimit
+ALIAS_SYMBOL(getrlimit64, getrlimit)
--- a/libc/arch-mips64/syscalls/lseek.S
+++ b/libc/arch-mips64/syscalls/lseek.S
@ -24,5 +24,4 @@ ENTRY(lseek)
    .set pop
 END(lseek)

-    .globl lseek64
-    .equ lseek64, lseek
+ALIAS_SYMBOL(lseek64, lseek)
--- a/libc/arch-mips64/syscalls/mmap.S
+++ b/libc/arch-mips64/syscalls/mmap.S
@ -24,5 +24,4 @@ ENTRY(mmap)
    .set pop
 END(mmap)

-    .globl mmap64
-    .equ mmap64, mmap
+ALIAS_SYMBOL(mmap64, mmap)
--- a/libc/arch-mips64/syscalls/pread64.S
+++ b/libc/arch-mips64/syscalls/pread64.S
@ -24,5 +24,4 @@ ENTRY(pread64)
    .set pop
 END(pread64)

-    .globl pread
-    .equ pread, pread64
+ALIAS_SYMBOL(pread, pread64)
--- a/libc/arch-mips64/syscalls/prlimit64.S
+++ b/libc/arch-mips64/syscalls/prlimit64.S
@ -24,5 +24,4 @@ ENTRY(prlimit64)
    .set pop
 END(prlimit64)

-    .globl prlimit
-    .equ prlimit, prlimit64
+ALIAS_SYMBOL(prlimit, prlimit64)
--- a/libc/arch-mips64/syscalls/pwrite64.S
+++ b/libc/arch-mips64/syscalls/pwrite64.S
@ -24,5 +24,4 @@ ENTRY(pwrite64)
    .set pop
 END(pwrite64)

-    .globl pwrite
-    .equ pwrite, pwrite64
+ALIAS_SYMBOL(pwrite, pwrite64)
--- a/libc/arch-mips64/syscalls/sendfile.S
+++ b/libc/arch-mips64/syscalls/sendfile.S
@ -24,5 +24,4 @@ ENTRY(sendfile)
    .set pop
 END(sendfile)

-    .globl sendfile64
-    .equ sendfile64, sendfile
+ALIAS_SYMBOL(sendfile64, sendfile)
--- a/libc/arch-mips64/syscalls/setrlimit.S
+++ b/libc/arch-mips64/syscalls/setrlimit.S
@ -24,5 +24,4 @@ ENTRY(setrlimit)
    .set pop
 END(setrlimit)

-    .globl setrlimit64
-    .equ setrlimit64, setrlimit
+ALIAS_SYMBOL(setrlimit64, setrlimit)
--- a/libc/arch-mips64/syscalls/truncate.S
+++ b/libc/arch-mips64/syscalls/truncate.S
@ -24,5 +24,4 @@ ENTRY(truncate)
    .set pop
 END(truncate)

-    .globl truncate64
-    .equ truncate64, truncate
+ALIAS_SYMBOL(truncate64, truncate)
--- a/libc/arch-x86/syscalls/_exit.S
+++ b/libc/arch-x86/syscalls/_exit.S
@ -20,5 +20,4 @@ ENTRY(_exit)
    ret
 END(_exit)

-    .globl _Exit
-    .equ _Exit, _exit
+ALIAS_SYMBOL(_Exit, _exit)
--- a/libc/arch-x86/syscalls/fstat64.S
+++ b/libc/arch-x86/syscalls/fstat64.S
@ -25,5 +25,4 @@ ENTRY(fstat64)
    ret
 END(fstat64)

-    .globl fstat
-    .equ fstat, fstat64
+ALIAS_SYMBOL(fstat, fstat64)
--- a/libc/arch-x86/syscalls/fstatat64.S
+++ b/libc/arch-x86/syscalls/fstatat64.S
@ -35,5 +35,4 @@ ENTRY(fstatat64)
    ret
 END(fstatat64)

-    .globl fstatat
-    .equ fstatat, fstatat64
+ALIAS_SYMBOL(fstatat, fstatat64)
--- a/libc/arch-x86_64/syscalls/_exit.S
+++ b/libc/arch-x86_64/syscalls/_exit.S
@ -14,5 +14,4 @@ ENTRY(_exit)
    ret
 END(_exit)

-    .globl _Exit
-    .equ _Exit, _exit
+ALIAS_SYMBOL(_Exit, _exit)
--- a/libc/arch-x86_64/syscalls/fallocate.S
+++ b/libc/arch-x86_64/syscalls/fallocate.S
@ -15,5 +15,4 @@ ENTRY(fallocate)
    ret
 END(fallocate)

-    .globl fallocate64
-    .equ fallocate64, fallocate
+ALIAS_SYMBOL(fallocate64, fallocate)
--- a/libc/arch-x86_64/syscalls/fstat64.S
+++ b/libc/arch-x86_64/syscalls/fstat64.S
@ -14,5 +14,4 @@ ENTRY(fstat64)
    ret
 END(fstat64)

-    .globl fstat
-    .equ fstat, fstat64
+ALIAS_SYMBOL(fstat, fstat64)
--- a/libc/arch-x86_64/syscalls/fstatat64.S
+++ b/libc/arch-x86_64/syscalls/fstatat64.S
@ -15,5 +15,4 @@ ENTRY(fstatat64)
    ret
 END(fstatat64)

-    .globl fstatat
-    .equ fstatat, fstatat64
+ALIAS_SYMBOL(fstatat, fstatat64)
--- a/libc/arch-x86_64/syscalls/ftruncate.S
+++ b/libc/arch-x86_64/syscalls/ftruncate.S
@ -14,5 +14,4 @@ ENTRY(ftruncate)
    ret
 END(ftruncate)

-    .globl ftruncate64
-    .equ ftruncate64, ftruncate
+ALIAS_SYMBOL(ftruncate64, ftruncate)
--- a/libc/arch-x86_64/syscalls/getrlimit.S
+++ b/libc/arch-x86_64/syscalls/getrlimit.S
@ -14,5 +14,4 @@ ENTRY(getrlimit)
    ret
 END(getrlimit)

-    .globl getrlimit64
-    .equ getrlimit64, getrlimit
+ALIAS_SYMBOL(getrlimit64, getrlimit)
--- a/libc/arch-x86_64/syscalls/lseek.S
+++ b/libc/arch-x86_64/syscalls/lseek.S
@ -14,5 +14,4 @@ ENTRY(lseek)
    ret
 END(lseek)

-    .globl lseek64
-    .equ lseek64, lseek
+ALIAS_SYMBOL(lseek64, lseek)
--- a/libc/arch-x86_64/syscalls/mmap.S
+++ b/libc/arch-x86_64/syscalls/mmap.S
@ -15,5 +15,4 @@ ENTRY(mmap)
    ret
 END(mmap)

-    .globl mmap64
-    .equ mmap64, mmap
+ALIAS_SYMBOL(mmap64, mmap)
--- a/libc/arch-x86_64/syscalls/pread64.S
+++ b/libc/arch-x86_64/syscalls/pread64.S
@ -15,5 +15,4 @@ ENTRY(pread64)
    ret
 END(pread64)

-    .globl pread
-    .equ pread, pread64
+ALIAS_SYMBOL(pread, pread64)
--- a/libc/arch-x86_64/syscalls/prlimit64.S
+++ b/libc/arch-x86_64/syscalls/prlimit64.S
@ -15,5 +15,4 @@ ENTRY(prlimit64)
    ret
 END(prlimit64)

-    .globl prlimit
-    .equ prlimit, prlimit64
+ALIAS_SYMBOL(prlimit, prlimit64)
--- a/libc/arch-x86_64/syscalls/pwrite64.S
+++ b/libc/arch-x86_64/syscalls/pwrite64.S
@ -15,5 +15,4 @@ ENTRY(pwrite64)
    ret
 END(pwrite64)

-    .globl pwrite
-    .equ pwrite, pwrite64
+ALIAS_SYMBOL(pwrite, pwrite64)
--- a/libc/arch-x86_64/syscalls/sendfile.S
+++ b/libc/arch-x86_64/syscalls/sendfile.S
@ -15,5 +15,4 @@ ENTRY(sendfile)
    ret
 END(sendfile)

-    .globl sendfile64
-    .equ sendfile64, sendfile
+ALIAS_SYMBOL(sendfile64, sendfile)
--- a/libc/arch-x86_64/syscalls/setrlimit.S
+++ b/libc/arch-x86_64/syscalls/setrlimit.S
@ -14,5 +14,4 @@ ENTRY(setrlimit)
    ret
 END(setrlimit)

-    .globl setrlimit64
-    .equ setrlimit64, setrlimit
+ALIAS_SYMBOL(setrlimit64, setrlimit)
--- a/libc/arch-x86_64/syscalls/truncate.S
+++ b/libc/arch-x86_64/syscalls/truncate.S
@ -14,5 +14,4 @@ ENTRY(truncate)
    ret
 END(truncate)

-    .globl truncate64
-    .equ truncate64, truncate
+ALIAS_SYMBOL(truncate64, truncate)
--- a/libc/tools/gensyscalls.py
+++ b/libc/tools/gensyscalls.py
@ -56,12 +56,6 @@ ENTRY(%(func)s)
 """


-function_alias = """
-    .globl %(alias)s
-    .equ %(alias)s, %(func)s
-"""
-
-
 #
 # ARM assembler templates for each syscall stub
 #
@ -284,7 +278,7 @@ def add_footer(pointer_length, stub, syscall):
    # Add any aliases for this syscall.
    aliases = syscall["aliases"]
    for alias in aliases:
-        stub += function_alias % { "func" : syscall["func"], "alias" : alias }
+        stub += "\nALIAS_SYMBOL(%s, %s)\n" % (alias, syscall["func"])

    # Use hidden visibility on LP64 for any functions beginning with underscores.
    # Force hidden visibility for any functions which begin with 3 underscores