OSDN Git Service

Fix build by avoiding the _C_LABEL macro.
authorElliott Hughes <enh@google.com>
Wed, 19 Feb 2014 00:42:36 +0000 (16:42 -0800)
committerElliott Hughes <enh@google.com>
Wed, 19 Feb 2014 00:42:36 +0000 (16:42 -0800)
Change-Id: Ide367c2b65071388bd95fbc81a4ed6ae94aec4e4

52 files changed:
libc/arch-arm/syscalls/fstat64.S
libc/arch-arm/syscalls/fstatat64.S
libc/arch-arm64/syscalls/fallocate.S
libc/arch-arm64/syscalls/fstat64.S
libc/arch-arm64/syscalls/fstatat64.S
libc/arch-arm64/syscalls/fstatfs64.S
libc/arch-arm64/syscalls/ftruncate.S
libc/arch-arm64/syscalls/getrlimit.S
libc/arch-arm64/syscalls/lseek.S
libc/arch-arm64/syscalls/mmap.S
libc/arch-arm64/syscalls/pread64.S
libc/arch-arm64/syscalls/prlimit64.S
libc/arch-arm64/syscalls/pwrite64.S
libc/arch-arm64/syscalls/sendfile.S
libc/arch-arm64/syscalls/setrlimit.S
libc/arch-arm64/syscalls/statfs64.S
libc/arch-arm64/syscalls/truncate.S
libc/arch-mips/syscalls/fstat64.S
libc/arch-mips/syscalls/fstatat64.S
libc/arch-mips64/syscalls/fallocate.S
libc/arch-mips64/syscalls/fstat64.S
libc/arch-mips64/syscalls/fstatat64.S
libc/arch-mips64/syscalls/fstatfs64.S
libc/arch-mips64/syscalls/ftruncate.S
libc/arch-mips64/syscalls/getrlimit.S
libc/arch-mips64/syscalls/lseek.S
libc/arch-mips64/syscalls/mmap.S
libc/arch-mips64/syscalls/pread64.S
libc/arch-mips64/syscalls/prlimit64.S
libc/arch-mips64/syscalls/pwrite64.S
libc/arch-mips64/syscalls/sendfile.S
libc/arch-mips64/syscalls/setrlimit.S
libc/arch-mips64/syscalls/statfs64.S
libc/arch-mips64/syscalls/truncate.S
libc/arch-x86/syscalls/fstat64.S
libc/arch-x86/syscalls/fstatat64.S
libc/arch-x86_64/syscalls/fallocate.S
libc/arch-x86_64/syscalls/fstat64.S
libc/arch-x86_64/syscalls/fstatat64.S
libc/arch-x86_64/syscalls/fstatfs64.S
libc/arch-x86_64/syscalls/ftruncate.S
libc/arch-x86_64/syscalls/getrlimit.S
libc/arch-x86_64/syscalls/lseek.S
libc/arch-x86_64/syscalls/mmap.S
libc/arch-x86_64/syscalls/pread64.S
libc/arch-x86_64/syscalls/prlimit64.S
libc/arch-x86_64/syscalls/pwrite64.S
libc/arch-x86_64/syscalls/sendfile.S
libc/arch-x86_64/syscalls/setrlimit.S
libc/arch-x86_64/syscalls/statfs64.S
libc/arch-x86_64/syscalls/truncate.S
libc/tools/gensyscalls.py

index 4eceb8f..7517a65 100644 (file)
@@ -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
index e919efe..752ee2f 100644 (file)
@@ -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
index e79b96a..15e727d 100644 (file)
@@ -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
index 56a1b35..fdff681 100644 (file)
@@ -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
index 97e0634..0f3ef4d 100644 (file)
@@ -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
index 2c0506d..6318d56 100644 (file)
@@ -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
index 7ed80b9..c8f5b6b 100644 (file)
@@ -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
index 21b471e..4fb5f7c 100644 (file)
@@ -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
index 867bb71..0c04203 100644 (file)
@@ -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
index a2d181a..4d49185 100644 (file)
@@ -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
index 0d098f1..b333946 100644 (file)
@@ -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
index 439e355..c8820ef 100644 (file)
@@ -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
index a10f76f..1ae312c 100644 (file)
@@ -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
index e540296..7bf415d 100644 (file)
@@ -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
index e723806..4bc412a 100644 (file)
@@ -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
index a449b35..c037980 100644 (file)
@@ -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
index f254c34..7e3385b 100644 (file)
@@ -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
index de09df5..904ce86 100644 (file)
@@ -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
index b177922..8c81a9f 100644 (file)
@@ -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
index dea8d27..347ab1f 100644 (file)
@@ -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
index 413d03b..aad3c21 100644 (file)
@@ -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
index df00901..828439a 100644 (file)
@@ -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
index 2276299..09380b2 100644 (file)
@@ -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
index 507825d..3afe26a 100644 (file)
@@ -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
index b944426..d19eaeb 100644 (file)
@@ -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
index 79c8dec..4385df5 100644 (file)
@@ -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
index 1cde691..682058e 100644 (file)
@@ -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
index b752147..a97a1d4 100644 (file)
@@ -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
index dea308f..e611bd0 100644 (file)
@@ -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
index b168ddf..08af91b 100644 (file)
@@ -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
index 1876239..bce8d58 100644 (file)
@@ -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
index e512c1d..9ed0024 100644 (file)
@@ -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
index 2fd7603..accd715 100644 (file)
@@ -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
index b68f35c..a79cdcd 100644 (file)
@@ -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
index 3e1fdd0..4e85c71 100644 (file)
@@ -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
index 4b98e88..05cec7b 100644 (file)
@@ -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
index e6959ca..9ba36b9 100644 (file)
@@ -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
index 1a2281b..6abb146 100644 (file)
@@ -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
index e429ecc..b85506c 100644 (file)
@@ -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
index fb3685a..983e6b7 100644 (file)
@@ -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
index 80cbe79..437b3e2 100644 (file)
@@ -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
index 0b3536c..6a9c9b6 100644 (file)
@@ -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
index a06b3ec..cf19776 100644 (file)
@@ -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
index d6f9687..9c3fc0f 100644 (file)
@@ -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
index 58b3176..5828a06 100644 (file)
@@ -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
index b451e8f..12be53a 100644 (file)
@@ -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
index 96215ce..1ada9d9 100644 (file)
@@ -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
index b56f487..72e5de4 100644 (file)
@@ -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
index e445ec0..dd393ae 100644 (file)
@@ -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
index fd6d54f..9341d43 100644 (file)
@@ -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
index 5e5eb8e..dfb6687 100644 (file)
@@ -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
index 30590cd..6388ee1 100755 (executable)
@@ -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
 """