Chromium Code Reviews| Index: src/untrusted/nacl/nacl.scons |
| diff --git a/src/untrusted/nacl/nacl.scons b/src/untrusted/nacl/nacl.scons |
| index 5bf698dc10ff492aa4a369f921cef4a8e19bd548..4c59c7db5801704354fc497135394ef68c97d949 100644 |
| --- a/src/untrusted/nacl/nacl.scons |
| +++ b/src/untrusted/nacl/nacl.scons |
| @@ -57,6 +57,81 @@ SRCS_NEWLIB_SYSCALL = [ |
| 'write.c', |
| ] |
| +SRCS_NEWLIB_STUBS = [ |
| + 'stubs/access-stub.c', |
| + 'stubs/chmod-stub.c', |
| + 'stubs/chown-stub.c', |
| + 'stubs/endpwent-stub.c', |
| + 'stubs/environ-stub.c', |
| + 'stubs/execle-stub.c', |
| + 'stubs/execvp-stub.c', |
| + 'stubs/execl-stub.c', |
| + 'stubs/execv-stub.c', |
| + 'stubs/execlp-stub.c', |
| + 'stubs/execve-stub.c', |
| + 'stubs/_execve-stub.c', |
| + 'stubs/fcntl-stub.c', |
| + 'stubs/fchdir-stub.c', |
| + 'stubs/fchmod-stub.c', |
| + 'stubs/fchown-stub.c', |
| + 'stubs/fdatasync-stub.c', |
| + 'stubs/fork-stub.c', |
| + 'stubs/fsync-stub.c', |
| + 'stubs/ftruncate-stub.c', |
| + 'stubs/get_current_dir_name-stub.c', |
| + 'stubs/getegid-stub.c', |
| + 'stubs/geteuid-stub.c', |
| + 'stubs/getgid-stub.c', |
| + 'stubs/getlogin-stub.c', |
| + 'stubs/getrusage-stub.c', |
| + 'stubs/getppid-stub.c', |
| + 'stubs/getpwent-stub.c', |
| + 'stubs/getpwnam-stub.c', |
| + 'stubs/getpwnam_r-stub.c', |
| + 'stubs/getpwuid-stub.c', |
| + 'stubs/getpwuid_r-stub.c', |
| + 'stubs/getuid-stub.c', |
| + 'stubs/getwd-stub.c', |
| + 'stubs/ioctl-stub.c', |
| + 'stubs/isatty-stub.c', |
| + 'stubs/issetugid-stub.c', |
| + 'stubs/kill-stub.c', |
| + 'stubs/lchown-stub.c', |
| + 'stubs/link-stub.c', |
| + 'stubs/llseek-stub.c', |
| + 'stubs/lstat-stub.c', |
| + 'stubs/pclose-stub.c', |
| + 'stubs/pipe-stub.c', |
| + 'stubs/popen-stub.c', |
| + 'stubs/pselect-stub.c', |
| + 'stubs/raise-stub.c', |
| + 'stubs/readlink-stub.c', |
| + 'stubs/remove-stub.c', |
| + 'stubs/rename-stub.c', |
| + 'stubs/select-stub.c', |
| + 'stubs/setegid-stub.c', |
| + 'stubs/seteuid-stub.c', |
| + 'stubs/setgid-stub.c', |
| + 'stubs/setpwent-stub.c', |
| + 'stubs/settimeofday-stub.c', |
| + 'stubs/setuid-stub.c', |
| + 'stubs/signal-stub.c', |
| + 'stubs/sigprocmask-stub.c', |
| + 'stubs/symlink-stub.c', |
| + 'stubs/system-stub.c', |
| + 'stubs/times-stub.c', |
| + 'stubs/tmpfile-stub.c', |
| + 'stubs/truncate-stub.c', |
| + 'stubs/ttyname-stub.c', |
| + 'stubs/ttyname_r-stub.c', |
| + 'stubs/umask-stub.c', |
| + 'stubs/utime-stub.c', |
| + 'stubs/utimes-stub.c', |
| + 'stubs/vfork-stub.c', |
| + 'stubs/wait-stub.c', |
| + 'stubs/waitpid-stub.c', |
| +] |
| + |
| SRCS_NEWLIB_MISC = [ |
| 'malloc.c', # malloc wrapper |
| 'stacktrace.c', # stack tracing for use with "-finstrument" |
| @@ -82,7 +157,10 @@ if env.Bit('nacl_glibc'): |
| # we do not build them here. |
| sources = SRCS_NACL_EXTENSIONS |
| else: |
| - sources = SRCS_NACL_EXTENSIONS + SRCS_NEWLIB_SYSCALL + SRCS_NEWLIB_MISC |
| + sources = SRCS_NACL_EXTENSIONS + \ |
|
Mark Seaborn
2013/08/23 15:45:22
Nit: Python style is to use ()s in preference to b
Petr Hosek
2013/08/23 21:35:07
Fixed.
|
| + SRCS_NEWLIB_SYSCALL + \ |
| + SRCS_NEWLIB_STUBS + \ |
| + SRCS_NEWLIB_MISC |
| if env.Bit('target_arm') and not env.Bit('bitcode'): |
| sources.append('aeabi_read_tp.S') |