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

* commit 'f5e0ba94d911ef2622ecfd3f7fabc4432a4806d3':
  Make gensyscalls.py use the ALIAS_SYMBOL macro.

libc/arch-arm/syscalls/_exit.S

@@ -13,5 +13,4 @@ ENTRY(_exit)
     b       __set_errno_internal
 END(_exit)
 
-    .globl _Exit
+ALIAS_SYMBOL(_Exit, _exit)
-    .equ _Exit, _exit

libc/arch-arm/syscalls/fstat64.S

@@ -13,5 +13,4 @@ ENTRY(fstat64)
     b       __set_errno_internal
 END(fstat64)
 
-    .globl fstat
+ALIAS_SYMBOL(fstat, fstat64)
-    .equ fstat, fstat64

libc/arch-arm/syscalls/fstatat64.S

@@ -13,5 +13,4 @@ ENTRY(fstatat64)
     b       __set_errno_internal
 END(fstatat64)
 
-    .globl fstatat
+ALIAS_SYMBOL(fstatat, fstatat64)
-    .equ fstatat, fstatat64

libc/arch-arm64/syscalls/_exit.S

@@ -13,5 +13,4 @@ ENTRY(_exit)
     ret
 END(_exit)
 
-    .globl _Exit
+ALIAS_SYMBOL(_Exit, _exit)
-    .equ _Exit, _exit

libc/arch-arm64/syscalls/fallocate.S

@@ -13,5 +13,4 @@ ENTRY(fallocate)
     ret
 END(fallocate)
 
-    .globl fallocate64
+ALIAS_SYMBOL(fallocate64, fallocate)
-    .equ fallocate64, fallocate

libc/arch-arm64/syscalls/fstat64.S

@@ -13,5 +13,4 @@ ENTRY(fstat64)
     ret
 END(fstat64)
 
-    .globl fstat
+ALIAS_SYMBOL(fstat, fstat64)
-    .equ fstat, fstat64

libc/arch-arm64/syscalls/fstatat64.S

@@ -13,5 +13,4 @@ ENTRY(fstatat64)
     ret
 END(fstatat64)
 
-    .globl fstatat
+ALIAS_SYMBOL(fstatat, fstatat64)
-    .equ fstatat, fstatat64

libc/arch-arm64/syscalls/ftruncate.S

@@ -13,5 +13,4 @@ ENTRY(ftruncate)
     ret
 END(ftruncate)
 
-    .globl ftruncate64
+ALIAS_SYMBOL(ftruncate64, ftruncate)
-    .equ ftruncate64, ftruncate

libc/arch-arm64/syscalls/getrlimit.S

@@ -13,5 +13,4 @@ ENTRY(getrlimit)
     ret
 END(getrlimit)
 
-    .globl getrlimit64
+ALIAS_SYMBOL(getrlimit64, getrlimit)
-    .equ getrlimit64, getrlimit

libc/arch-arm64/syscalls/lseek.S

@@ -13,5 +13,4 @@ ENTRY(lseek)
     ret
 END(lseek)
 
-    .globl lseek64
+ALIAS_SYMBOL(lseek64, lseek)
-    .equ lseek64, lseek

libc/arch-arm64/syscalls/mmap.S

@@ -13,5 +13,4 @@ ENTRY(mmap)
     ret
 END(mmap)
 
-    .globl mmap64
+ALIAS_SYMBOL(mmap64, mmap)
-    .equ mmap64, mmap

libc/arch-arm64/syscalls/pread64.S

@@ -13,5 +13,4 @@ ENTRY(pread64)
     ret
 END(pread64)
 
-    .globl pread
+ALIAS_SYMBOL(pread, pread64)
-    .equ pread, pread64

libc/arch-arm64/syscalls/prlimit64.S

@@ -13,5 +13,4 @@ ENTRY(prlimit64)
     ret
 END(prlimit64)
 
-    .globl prlimit
+ALIAS_SYMBOL(prlimit, prlimit64)
-    .equ prlimit, prlimit64

libc/arch-arm64/syscalls/pwrite64.S

@@ -13,5 +13,4 @@ ENTRY(pwrite64)
     ret
 END(pwrite64)
 
-    .globl pwrite
+ALIAS_SYMBOL(pwrite, pwrite64)
-    .equ pwrite, pwrite64

libc/arch-arm64/syscalls/sendfile.S

@@ -13,5 +13,4 @@ ENTRY(sendfile)
     ret
 END(sendfile)
 
-    .globl sendfile64
+ALIAS_SYMBOL(sendfile64, sendfile)
-    .equ sendfile64, sendfile

libc/arch-arm64/syscalls/setrlimit.S

@@ -13,5 +13,4 @@ ENTRY(setrlimit)
     ret
 END(setrlimit)
 
-    .globl setrlimit64
+ALIAS_SYMBOL(setrlimit64, setrlimit)
-    .equ setrlimit64, setrlimit

libc/arch-arm64/syscalls/truncate.S

@@ -13,5 +13,4 @@ ENTRY(truncate)
     ret
 END(truncate)
 
-    .globl truncate64
+ALIAS_SYMBOL(truncate64, truncate)
-    .equ truncate64, truncate

libc/arch-mips/syscalls/_exit.S

@@ -18,5 +18,4 @@ ENTRY(_exit)
     .set reorder
 END(_exit)
 
-    .globl _Exit
+ALIAS_SYMBOL(_Exit, _exit)
-    .equ _Exit, _exit

libc/arch-mips/syscalls/fstat64.S

@@ -18,5 +18,4 @@ ENTRY(fstat64)
     .set reorder
 END(fstat64)
 
-    .globl fstat
+ALIAS_SYMBOL(fstat, fstat64)
-    .equ fstat, fstat64

libc/arch-mips/syscalls/fstatat64.S

@@ -18,5 +18,4 @@ ENTRY(fstatat64)
     .set reorder
 END(fstatat64)
 
-    .globl fstatat
+ALIAS_SYMBOL(fstatat, fstatat64)
-    .equ fstatat, fstatat64

libc/arch-mips64/syscalls/_exit.S

@@ -24,5 +24,4 @@ ENTRY(_exit)
     .set pop
 END(_exit)
 
-    .globl _Exit
+ALIAS_SYMBOL(_Exit, _exit)
-    .equ _Exit, _exit

libc/arch-mips64/syscalls/fallocate.S

@@ -24,5 +24,4 @@ ENTRY(fallocate)
     .set pop
 END(fallocate)
 
-    .globl fallocate64
+ALIAS_SYMBOL(fallocate64, fallocate)
-    .equ fallocate64, fallocate

libc/arch-mips64/syscalls/ftruncate.S

@@ -24,5 +24,4 @@ ENTRY(ftruncate)
     .set pop
 END(ftruncate)
 
-    .globl ftruncate64
+ALIAS_SYMBOL(ftruncate64, ftruncate)
-    .equ ftruncate64, ftruncate

libc/arch-mips64/syscalls/getrlimit.S

@@ -24,5 +24,4 @@ ENTRY(getrlimit)
     .set pop
 END(getrlimit)
 
-    .globl getrlimit64
+ALIAS_SYMBOL(getrlimit64, getrlimit)
-    .equ getrlimit64, getrlimit

libc/arch-mips64/syscalls/lseek.S

@@ -24,5 +24,4 @@ ENTRY(lseek)
     .set pop
 END(lseek)
 
-    .globl lseek64
+ALIAS_SYMBOL(lseek64, lseek)
-    .equ lseek64, lseek

libc/arch-mips64/syscalls/mmap.S

@@ -24,5 +24,4 @@ ENTRY(mmap)
     .set pop
 END(mmap)
 
-    .globl mmap64
+ALIAS_SYMBOL(mmap64, mmap)
-    .equ mmap64, mmap

libc/arch-mips64/syscalls/pread64.S

@@ -24,5 +24,4 @@ ENTRY(pread64)
     .set pop
 END(pread64)
 
-    .globl pread
+ALIAS_SYMBOL(pread, pread64)
-    .equ pread, pread64

libc/arch-mips64/syscalls/prlimit64.S

@@ -24,5 +24,4 @@ ENTRY(prlimit64)
     .set pop
 END(prlimit64)
 
-    .globl prlimit
+ALIAS_SYMBOL(prlimit, prlimit64)
-    .equ prlimit, prlimit64

libc/arch-mips64/syscalls/pwrite64.S

@@ -24,5 +24,4 @@ ENTRY(pwrite64)
     .set pop
 END(pwrite64)
 
-    .globl pwrite
+ALIAS_SYMBOL(pwrite, pwrite64)
-    .equ pwrite, pwrite64

libc/arch-mips64/syscalls/sendfile.S

@@ -24,5 +24,4 @@ ENTRY(sendfile)
     .set pop
 END(sendfile)
 
-    .globl sendfile64
+ALIAS_SYMBOL(sendfile64, sendfile)
-    .equ sendfile64, sendfile

libc/arch-mips64/syscalls/setrlimit.S

@@ -24,5 +24,4 @@ ENTRY(setrlimit)
     .set pop
 END(setrlimit)
 
-    .globl setrlimit64
+ALIAS_SYMBOL(setrlimit64, setrlimit)
-    .equ setrlimit64, setrlimit

libc/arch-mips64/syscalls/truncate.S

@@ -24,5 +24,4 @@ ENTRY(truncate)
     .set pop
 END(truncate)
 
-    .globl truncate64
+ALIAS_SYMBOL(truncate64, truncate)
-    .equ truncate64, truncate

libc/arch-x86/syscalls/_exit.S

@@ -20,5 +20,4 @@ ENTRY(_exit)
     ret
 END(_exit)
 
-    .globl _Exit
+ALIAS_SYMBOL(_Exit, _exit)
-    .equ _Exit, _exit

libc/arch-x86/syscalls/fstat64.S

@@ -25,5 +25,4 @@ ENTRY(fstat64)
     ret
 END(fstat64)
 
-    .globl fstat
+ALIAS_SYMBOL(fstat, fstat64)
-    .equ fstat, fstat64

libc/arch-x86/syscalls/fstatat64.S

@@ -35,5 +35,4 @@ ENTRY(fstatat64)
     ret
 END(fstatat64)
 
-    .globl fstatat
+ALIAS_SYMBOL(fstatat, fstatat64)
-    .equ fstatat, fstatat64

libc/arch-x86_64/syscalls/_exit.S

@@ -14,5 +14,4 @@ ENTRY(_exit)
     ret
 END(_exit)
 
-    .globl _Exit
+ALIAS_SYMBOL(_Exit, _exit)
-    .equ _Exit, _exit

libc/arch-x86_64/syscalls/fallocate.S

@@ -15,5 +15,4 @@ ENTRY(fallocate)
     ret
 END(fallocate)
 
-    .globl fallocate64
+ALIAS_SYMBOL(fallocate64, fallocate)
-    .equ fallocate64, fallocate

libc/arch-x86_64/syscalls/fstat64.S

@@ -14,5 +14,4 @@ ENTRY(fstat64)
     ret
 END(fstat64)
 
-    .globl fstat
+ALIAS_SYMBOL(fstat, fstat64)
-    .equ fstat, fstat64

libc/arch-x86_64/syscalls/fstatat64.S

@@ -15,5 +15,4 @@ ENTRY(fstatat64)
     ret
 END(fstatat64)
 
-    .globl fstatat
+ALIAS_SYMBOL(fstatat, fstatat64)
-    .equ fstatat, fstatat64

libc/arch-x86_64/syscalls/ftruncate.S

@@ -14,5 +14,4 @@ ENTRY(ftruncate)
     ret
 END(ftruncate)
 
-    .globl ftruncate64
+ALIAS_SYMBOL(ftruncate64, ftruncate)
-    .equ ftruncate64, ftruncate

libc/arch-x86_64/syscalls/getrlimit.S

@@ -14,5 +14,4 @@ ENTRY(getrlimit)
     ret
 END(getrlimit)
 
-    .globl getrlimit64
+ALIAS_SYMBOL(getrlimit64, getrlimit)
-    .equ getrlimit64, getrlimit

libc/arch-x86_64/syscalls/lseek.S

@@ -14,5 +14,4 @@ ENTRY(lseek)
     ret
 END(lseek)
 
-    .globl lseek64
+ALIAS_SYMBOL(lseek64, lseek)
-    .equ lseek64, lseek

libc/arch-x86_64/syscalls/mmap.S

@@ -15,5 +15,4 @@ ENTRY(mmap)
     ret
 END(mmap)
 
-    .globl mmap64
+ALIAS_SYMBOL(mmap64, mmap)
-    .equ mmap64, mmap

libc/arch-x86_64/syscalls/pread64.S

@@ -15,5 +15,4 @@ ENTRY(pread64)
     ret
 END(pread64)
 
-    .globl pread
+ALIAS_SYMBOL(pread, pread64)
-    .equ pread, pread64

libc/arch-x86_64/syscalls/prlimit64.S

@@ -15,5 +15,4 @@ ENTRY(prlimit64)
     ret
 END(prlimit64)
 
-    .globl prlimit
+ALIAS_SYMBOL(prlimit, prlimit64)
-    .equ prlimit, prlimit64

libc/arch-x86_64/syscalls/pwrite64.S

@@ -15,5 +15,4 @@ ENTRY(pwrite64)
     ret
 END(pwrite64)
 
-    .globl pwrite
+ALIAS_SYMBOL(pwrite, pwrite64)
-    .equ pwrite, pwrite64

libc/arch-x86_64/syscalls/sendfile.S

@@ -15,5 +15,4 @@ ENTRY(sendfile)
     ret
 END(sendfile)
 
-    .globl sendfile64
+ALIAS_SYMBOL(sendfile64, sendfile)
-    .equ sendfile64, sendfile

libc/arch-x86_64/syscalls/setrlimit.S

@@ -14,5 +14,4 @@ ENTRY(setrlimit)
     ret
 END(setrlimit)
 
-    .globl setrlimit64
+ALIAS_SYMBOL(setrlimit64, setrlimit)
-    .equ setrlimit64, setrlimit

libc/arch-x86_64/syscalls/truncate.S

@@ -14,5 +14,4 @@ ENTRY(truncate)
     ret
 END(truncate)
 
-    .globl truncate64
+ALIAS_SYMBOL(truncate64, truncate)
-    .equ truncate64, truncate

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