am 24ef4779: Merge "Fix build by avoiding the _C_LABEL macro."

* commit '24ef4779eb47f23b8d4f4e678d677bd45a91373f': Fix build by avoiding the _C_LABEL macro.
2014-03-07 19:40:10 +00:00 · 2014-03-07 19:40:10 +00:00 · 2bb7f7c9a2
commit 2bb7f7c9a2
parent 3d7a897b68 24ef4779eb
52 changed files with 104 additions and 104 deletions
--- a/libc/arch-arm/syscalls/fstat64.S
+++ b/libc/arch-arm/syscalls/fstat64.S
@ -13,5 +13,5 @@ ENTRY(fstat64)
    b       __set_errno
 END(fstat64)

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

-    .globl _C_LABEL(fstatat)
-    .equ _C_LABEL(fstatat), _C_LABEL(fstatat64)
+    .globl fstatat
+    .equ fstatat, fstatat64
--- a/libc/arch-arm64/syscalls/fallocate.S
+++ b/libc/arch-arm64/syscalls/fallocate.S
@ -20,5 +20,5 @@ ENTRY(fallocate)
    ret
 END(fallocate)

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

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

-    .globl _C_LABEL(fstatat)
-    .equ _C_LABEL(fstatat), _C_LABEL(fstatat64)
+    .globl fstatat
+    .equ fstatat, fstatat64
--- a/libc/arch-arm64/syscalls/fstatfs64.S
+++ b/libc/arch-arm64/syscalls/fstatfs64.S
@ -20,5 +20,5 @@ ENTRY(fstatfs64)
    ret
 END(fstatfs64)

-    .globl _C_LABEL(fstatfs)
-    .equ _C_LABEL(fstatfs), _C_LABEL(fstatfs64)
+    .globl fstatfs
+    .equ fstatfs, fstatfs64
--- a/libc/arch-arm64/syscalls/ftruncate.S
+++ b/libc/arch-arm64/syscalls/ftruncate.S
@ -20,5 +20,5 @@ ENTRY(ftruncate)
    ret
 END(ftruncate)

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

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

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

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

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

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

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

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

-    .globl _C_LABEL(setrlimit64)
-    .equ _C_LABEL(setrlimit64), _C_LABEL(setrlimit)
+    .globl setrlimit64
+    .equ setrlimit64, setrlimit
--- a/libc/arch-arm64/syscalls/statfs64.S
+++ b/libc/arch-arm64/syscalls/statfs64.S
@ -20,5 +20,5 @@ ENTRY(statfs64)
    ret
 END(statfs64)

-    .globl _C_LABEL(statfs)
-    .equ _C_LABEL(statfs), _C_LABEL(statfs64)
+    .globl statfs
+    .equ statfs, statfs64
--- a/libc/arch-arm64/syscalls/truncate.S
+++ b/libc/arch-arm64/syscalls/truncate.S
@ -20,5 +20,5 @@ ENTRY(truncate)
    ret
 END(truncate)

-    .globl _C_LABEL(truncate64)
-    .equ _C_LABEL(truncate64), _C_LABEL(truncate)
+    .globl truncate64
+    .equ truncate64, truncate
--- a/libc/arch-mips/syscalls/fstat64.S
+++ b/libc/arch-mips/syscalls/fstat64.S
@ -22,5 +22,5 @@ fstat64:
    .set reorder
    .end fstat64

-    .globl _C_LABEL(fstat)
-    .equ _C_LABEL(fstat), _C_LABEL(fstat64)
+    .globl fstat
+    .equ fstat, fstat64
--- a/libc/arch-mips/syscalls/fstatat64.S
+++ b/libc/arch-mips/syscalls/fstatat64.S
@ -22,5 +22,5 @@ fstatat64:
    .set reorder
    .end fstatat64

-    .globl _C_LABEL(fstatat)
-    .equ _C_LABEL(fstatat), _C_LABEL(fstatat64)
+    .globl fstatat
+    .equ fstatat, fstatat64
--- a/libc/arch-mips64/syscalls/fallocate.S
+++ b/libc/arch-mips64/syscalls/fallocate.S
@ -30,5 +30,5 @@ fallocate:
    .set pop
    .end fallocate

-    .globl _C_LABEL(fallocate64)
-    .equ _C_LABEL(fallocate64), _C_LABEL(fallocate)
+    .globl fallocate64
+    .equ fallocate64, fallocate
--- a/libc/arch-mips64/syscalls/fstat64.S
+++ b/libc/arch-mips64/syscalls/fstat64.S
@ -30,5 +30,5 @@ fstat64:
    .set pop
    .end fstat64

-    .globl _C_LABEL(fstat)
-    .equ _C_LABEL(fstat), _C_LABEL(fstat64)
+    .globl fstat
+    .equ fstat, fstat64
--- a/libc/arch-mips64/syscalls/fstatat64.S
+++ b/libc/arch-mips64/syscalls/fstatat64.S
@ -30,5 +30,5 @@ fstatat64:
    .set pop
    .end fstatat64

-    .globl _C_LABEL(fstatat)
-    .equ _C_LABEL(fstatat), _C_LABEL(fstatat64)
+    .globl fstatat
+    .equ fstatat, fstatat64
--- a/libc/arch-mips64/syscalls/fstatfs64.S
+++ b/libc/arch-mips64/syscalls/fstatfs64.S
@ -30,5 +30,5 @@ fstatfs64:
    .set pop
    .end fstatfs64

-    .globl _C_LABEL(fstatfs)
-    .equ _C_LABEL(fstatfs), _C_LABEL(fstatfs64)
+    .globl fstatfs
+    .equ fstatfs, fstatfs64
--- a/libc/arch-mips64/syscalls/ftruncate.S
+++ b/libc/arch-mips64/syscalls/ftruncate.S
@ -30,5 +30,5 @@ ftruncate:
    .set pop
    .end ftruncate

-    .globl _C_LABEL(ftruncate64)
-    .equ _C_LABEL(ftruncate64), _C_LABEL(ftruncate)
+    .globl ftruncate64
+    .equ ftruncate64, ftruncate
--- a/libc/arch-mips64/syscalls/getrlimit.S
+++ b/libc/arch-mips64/syscalls/getrlimit.S
@ -30,5 +30,5 @@ getrlimit:
    .set pop
    .end getrlimit

-    .globl _C_LABEL(getrlimit64)
-    .equ _C_LABEL(getrlimit64), _C_LABEL(getrlimit)
+    .globl getrlimit64
+    .equ getrlimit64, getrlimit
--- a/libc/arch-mips64/syscalls/lseek.S
+++ b/libc/arch-mips64/syscalls/lseek.S
@ -30,5 +30,5 @@ lseek:
    .set pop
    .end lseek

-    .globl _C_LABEL(lseek64)
-    .equ _C_LABEL(lseek64), _C_LABEL(lseek)
+    .globl lseek64
+    .equ lseek64, lseek
--- a/libc/arch-mips64/syscalls/mmap.S
+++ b/libc/arch-mips64/syscalls/mmap.S
@ -30,5 +30,5 @@ mmap:
    .set pop
    .end mmap

-    .globl _C_LABEL(mmap64)
-    .equ _C_LABEL(mmap64), _C_LABEL(mmap)
+    .globl mmap64
+    .equ mmap64, mmap
--- a/libc/arch-mips64/syscalls/pread64.S
+++ b/libc/arch-mips64/syscalls/pread64.S
@ -30,5 +30,5 @@ pread64:
    .set pop
    .end pread64

-    .globl _C_LABEL(pread)
-    .equ _C_LABEL(pread), _C_LABEL(pread64)
+    .globl pread
+    .equ pread, pread64
--- a/libc/arch-mips64/syscalls/prlimit64.S
+++ b/libc/arch-mips64/syscalls/prlimit64.S
@ -30,5 +30,5 @@ prlimit64:
    .set pop
    .end prlimit64

-    .globl _C_LABEL(prlimit)
-    .equ _C_LABEL(prlimit), _C_LABEL(prlimit64)
+    .globl prlimit
+    .equ prlimit, prlimit64
--- a/libc/arch-mips64/syscalls/pwrite64.S
+++ b/libc/arch-mips64/syscalls/pwrite64.S
@ -30,5 +30,5 @@ pwrite64:
    .set pop
    .end pwrite64

-    .globl _C_LABEL(pwrite)
-    .equ _C_LABEL(pwrite), _C_LABEL(pwrite64)
+    .globl pwrite
+    .equ pwrite, pwrite64
--- a/libc/arch-mips64/syscalls/sendfile.S
+++ b/libc/arch-mips64/syscalls/sendfile.S
@ -30,5 +30,5 @@ sendfile:
    .set pop
    .end sendfile

-    .globl _C_LABEL(sendfile64)
-    .equ _C_LABEL(sendfile64), _C_LABEL(sendfile)
+    .globl sendfile64
+    .equ sendfile64, sendfile
--- a/libc/arch-mips64/syscalls/setrlimit.S
+++ b/libc/arch-mips64/syscalls/setrlimit.S
@ -30,5 +30,5 @@ setrlimit:
    .set pop
    .end setrlimit

-    .globl _C_LABEL(setrlimit64)
-    .equ _C_LABEL(setrlimit64), _C_LABEL(setrlimit)
+    .globl setrlimit64
+    .equ setrlimit64, setrlimit
--- a/libc/arch-mips64/syscalls/statfs64.S
+++ b/libc/arch-mips64/syscalls/statfs64.S
@ -30,5 +30,5 @@ statfs64:
    .set pop
    .end statfs64

-    .globl _C_LABEL(statfs)
-    .equ _C_LABEL(statfs), _C_LABEL(statfs64)
+    .globl statfs
+    .equ statfs, statfs64
--- a/libc/arch-mips64/syscalls/truncate.S
+++ b/libc/arch-mips64/syscalls/truncate.S
@ -30,5 +30,5 @@ truncate:
    .set pop
    .end truncate

-    .globl _C_LABEL(truncate64)
-    .equ _C_LABEL(truncate64), _C_LABEL(truncate)
+    .globl truncate64
+    .equ truncate64, truncate
--- a/libc/arch-x86/syscalls/fstat64.S
+++ b/libc/arch-x86/syscalls/fstat64.S
@ -25,5 +25,5 @@ ENTRY(fstat64)
    ret
 END(fstat64)

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

-    .globl _C_LABEL(fstatat)
-    .equ _C_LABEL(fstatat), _C_LABEL(fstatat64)
+    .globl fstatat
+    .equ fstatat, fstatat64
--- a/libc/arch-x86_64/syscalls/fallocate.S
+++ b/libc/arch-x86_64/syscalls/fallocate.S
@ -16,5 +16,5 @@ ENTRY(fallocate)
    ret
 END(fallocate)

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

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

-    .globl _C_LABEL(fstatat)
-    .equ _C_LABEL(fstatat), _C_LABEL(fstatat64)
+    .globl fstatat
+    .equ fstatat, fstatat64
--- a/libc/arch-x86_64/syscalls/fstatfs64.S
+++ b/libc/arch-x86_64/syscalls/fstatfs64.S
@ -15,5 +15,5 @@ ENTRY(fstatfs64)
    ret
 END(fstatfs64)

-    .globl _C_LABEL(fstatfs)
-    .equ _C_LABEL(fstatfs), _C_LABEL(fstatfs64)
+    .globl fstatfs
+    .equ fstatfs, fstatfs64
--- a/libc/arch-x86_64/syscalls/ftruncate.S
+++ b/libc/arch-x86_64/syscalls/ftruncate.S
@ -15,5 +15,5 @@ ENTRY(ftruncate)
    ret
 END(ftruncate)

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

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

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

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

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

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

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

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

-    .globl _C_LABEL(setrlimit64)
-    .equ _C_LABEL(setrlimit64), _C_LABEL(setrlimit)
+    .globl setrlimit64
+    .equ setrlimit64, setrlimit
--- a/libc/arch-x86_64/syscalls/statfs64.S
+++ b/libc/arch-x86_64/syscalls/statfs64.S
@ -15,5 +15,5 @@ ENTRY(statfs64)
    ret
 END(statfs64)

-    .globl _C_LABEL(statfs)
-    .equ _C_LABEL(statfs), _C_LABEL(statfs64)
+    .globl statfs
+    .equ statfs, statfs64
--- a/libc/arch-x86_64/syscalls/truncate.S
+++ b/libc/arch-x86_64/syscalls/truncate.S
@ -15,5 +15,5 @@ ENTRY(truncate)
    ret
 END(truncate)

-    .globl _C_LABEL(truncate64)
-    .equ _C_LABEL(truncate64), _C_LABEL(truncate)
+    .globl truncate64
+    .equ truncate64, truncate
--- a/libc/tools/gensyscalls.py
+++ b/libc/tools/gensyscalls.py
@ -48,8 +48,8 @@ ENTRY(%(func)s)


 function_alias = """
-    .globl _C_LABEL(%(alias)s)
-    .equ _C_LABEL(%(alias)s), _C_LABEL(%(func)s)
+    .globl %(alias)s
+    .equ %(alias)s, %(func)s
 """