diff options
author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 23:54:04 +0000 |
---|---|---|
committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 23:54:04 +0000 |
commit | 20c5f1af1a6a025cbabec989121bb0f7068ddb61 (patch) | |
tree | 3a870f199b5a7bc4c7f34a113802db138bb113cb /DEPS | |
parent | 6c8011ba4444175246f07a70db95806bdfbf3562 (diff) | |
download | chromium_src-20c5f1af1a6a025cbabec989121bb0f7068ddb61.zip chromium_src-20c5f1af1a6a025cbabec989121bb0f7068ddb61.tar.gz chromium_src-20c5f1af1a6a025cbabec989121bb0f7068ddb61.tar.bz2 |
Revert 114717 - Broke the ChromeOS build
See: http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20Clang%20%28ChromeOS%20dbg%29/builds/4610/steps/compile/logs/stdio
make: *** [out/Debug/obj/gen/tc_glibc/lib32/libsrpc.a] Error 255
make: *** [out/Debug/obj/gen/tc_glibc/lib32/libplatform.a] Error 255
make: *** [out/Debug/obj/gen/tc_glibc/lib32/libimc_syscalls.a] Error 255
make: *** [out/Debug/obj/gen/tc_glibc/lib32/libgio.a] Error 255
ACTION ppapi_cpp_lib_build_newlib_x86-32_nlib out/Debug/obj/gen/tc_newlib/lib32/libppapi_cpp.a
ACTION ppapi_stub_lib_build_glibc_x86-32_nlib out/Debug/obj/gen/tc_glibc/lib32/libppapi_stub.a
Compile cpp/audio.cc
../native_client/toolchain/linux_x86_newlib/x86_64-nacl/bin/g++ -c cpp/audio.cc -o /mnt/data/b/build/slave/chromium-dbg-linux-chromeos-clang/build/src/out/Debug/obj.target/ppapi_cpp_lib/geni/newlib-x86-32/ppapi_cpp_lib/audio.o -m32 -O3 -fomit-frame-pointer -mtls-use-call -DNACL_BLOCK_SHIFT=5 -DNACL_BLOCK_SIZE=32 -DNACL_BUILD_ARCH=x86 -D__linux__ -D__STDC_LIMIT_MACROS=1 -D__STDC_FORMAT_MACROS=1 -D_GNU_SOURCE=1 -D_BSD_SOURCE=1 -D_POSIX_C_SOURCE=199506 -D_XOPEN_SOURCE=600 -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DDYNAMIC_ANNOTATIONS_PREFIX=NACL_ -DNACL_BUILD_SUBARCH=32 -I/mnt/data/b/build/slave/chromium-dbg-linux-chromeos-clang/build/src/out/Debug/obj/gen/tc_newlib/include -I.. -I../ppapi -I.. -I../ppapi
Compile ppapi_plugin_main.c
../../../../native_client/toolchain/linux_x86/x86_64-nacl/bin/gcc -c ppapi_plugin_main.c -o /mnt/data/b/build/slave/chromium-dbg-linux-chromeos-clang/build/src/out/Debug/obj.target/ppapi_stub_lib/geni/glibc-x86-32/ppapi_stub_lib/ppapi_plugin_main.o -std=gnu99 -m32 -O3 -fomit-frame-pointer -mtls-use-call -DNACL_BLOCK_SHIFT=5 -DNACL_BLOCK_SIZE=32 -DNACL_BUILD_ARCH=x86 -D__linux__ -D__STDC_LIMIT_MACROS=1 -D__STDC_FORMAT_MACROS=1 -D_GNU_SOURCE=1 -D_BSD_SOURCE=1 -D_POSIX_C_SOURCE=199506 -D_XOPEN_SOURCE=600 -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DDYNAMIC_ANNOTATIONS_PREFIX=NACL_ -DNACL_BUILD_SUBARCH=32 -I/mnt/data/b/build/slave/chromium-dbg-linux-chromeos-clang/build/src/out/Debug/obj/gen/tc_glibc/include -I../../../.. -I../../../../ppapi -I../../../.. -I../../../../ppapi
>>>../../../../native_client/build/build_nexe.py>> <<--arch>> <<x86-32>> <<--build>> <<glibc_nlib>> <<--root>> <<../../../..>> <<--name>> <</mnt/data/b/build/slave/chromium-dbg-linux-chromeos-clang/build/src/out/Debug/obj/gen/tc_glibc/lib32/libppapi_stub.a>> <<--objdir>> <</mnt/data/b/build/slave/chromium-dbg-linux-chromeos-clang/build/src/out/Debug/obj.target/ppapi_stub_lib/geni/glibc-x86-32/ppapi_stub_lib>> <<--include-dirs>> <</mnt/data/b/build/slave/chromium-dbg-linux-chromeos-clang/build/src/out/Debug/obj/gen/tc_glibc/include ../../../.. ../../../../ppapi ../../../.. ../../../../ppapi>> <<--lib-dirs>> << >> <<--compile_flags>> <<-m32 -O3 -fomit-frame-pointer -mtls-use-call>> <<-DNACL_BLOCK_SHIFT=5>> <<-DNACL_BLOCK_SIZE=32>> <<-DNACL_BUILD_ARCH=x86>> <<-D__linux__>> <<-D__STDC_LIMIT_MACROS=1>> <<-D__STDC_FORMAT_MACROS=1>> <<-D_GNU_SOURCE=1>> <<-D_BSD_SOURCE=1>> <<-D_POSIX_C_SOURCE=199506>> <<-D_XOPEN_SOURCE=600>> <<-DDYNAMIC_ANNOTATIONS_ENABLED=1>> <<-DDYNAMIC_ANNOTATIONS_PREFIX=NACL_>> <<-DNACL_BUILD_SUBARCH=32>> <<--link_flags>> <<-m32 -B/mnt/data/b/build/slave/chromium-dbg-linux-chromeos-clang/build/src/out/Debug/obj/gen/tc_glibc/lib32 >> <<ppapi_plugin_main.c>> <<ppapi_plugin_start.c>> <<plugin_main_irt.c>> <<thread_creator.c<<
../../../../native_client/build/build_nexe.py --arch x86-32 --build glibc_nlib --root ../../../.. --name /mnt/data/b/build/slave/chromium-dbg-linux-chromeos-clang/build/src/out/Debug/obj/gen/tc_glibc/lib32/libppapi_stub.a --objdir /mnt/data/b/build/slave/chromium-dbg-linux-chromeos-clang/build/src/out/Debug/obj.target/ppapi_stub_lib/geni/glibc-x86-32/ppapi_stub_lib --include-dirs /mnt/data/b/build/slave/chromium-dbg-linux-chromeos-clang/build/src/out/Debug/obj/gen/tc_glibc/include ../../../.. ../../../../ppapi ../../../.. ../../../../ppapi --lib-dirs --compile_flags -m32 -O3 -fomit-frame-pointer -mtls-use-call -DNACL_BLOCK_SHIFT=5 -DNACL_BLOCK_SIZE=32 -DNACL_BUILD_ARCH=x86 -D__linux__ -D__STDC_LIMIT_MACROS=1 -D__STDC_FORMAT_MACROS=1 -D_GNU_SOURCE=1 -D_BSD_SOURCE=1 -D_POSIX_C_SOURCE=199506 -D_XOPEN_SOURCE=600 -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DDYNAMIC_ANNOTATIONS_PREFIX=NACL_ -DNACL_BUILD_SUBARCH=32 --link_flags -m32 -B/mnt/data/b/build/slave/chromium-dbg-linux-chromeos-clang/build/src/out/Debug/obj/gen/tc_glibc/lib32 ppapi_plugin_main.c ppapi_plugin_start.c plugin_main_irt.c thread_creator.c<<
../../../../native_client/toolchain/linux_x86/x86_64-nacl/bin/gcc -c ppapi_plugin_main.c -o /mnt/data/b/build/slave/chromium-dbg-linux-chromeos-clang/build/src/out/Debug/obj.target/ppapi_stub_lib/geni/glibc-x86-32/ppapi_stub_lib/ppapi_plugin_main.o -std=gnu99 -m32 -O3 -fomit-frame-pointer -mtls-use-call -DNACL_BLOCK_SHIFT=5 -DNACL_BLOCK_SIZE=32 -DNACL_BUILD_ARCH=x86 -D__linux__ -D__STDC_LIMIT_MACROS=1 -D__STDC_FORMAT_MACROS=1 -D_GNU_SOURCE=1 -D_BSD_SOURCE=1 -D_POSIX_C_SOURCE=199506 -D_XOPEN_SOURCE=600 -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DDYNAMIC_ANNOTATIONS_PREFIX=NACL_ -DNACL_BUILD_SUBARCH=32 -I/mnt/data/b/build/slave/chromium-dbg-linux-chromeos-clang/build/src/out/Debug/obj/gen/tc_glibc/include -I../../../.. -I../../../../ppapi -I../../../.. -I../../../../ppapi
FAILED: [Errno 2] No such file or directory
NaCl: Update revision in DEPS, r7388 -> r7446
This pulls in the following Native Client changes:
r7389: (dschuff) Some additional torture test failures with O3 not caught before
r7390: (krasin) Enable run_strto{,u}ll_test for x86-64. They were recently fixed.
r7391: (mseaborn) Re-enable multiple-sandboxes test on Windows
r7392: (pdox) Scons: Remove unused IrtIsBroken() function.
r7393: (jvoung) Clean out use_pnacl_irt from run.py now that bitcode=1 doesn't affect the IRT build.
r7394: (pasko) Add a quick-n-dirty nacl64-gdb attacher.
r7395: (robertm) Disable nacl_semaphore_test test when run under Qemu/arm because of flakiness.
r7396: (robertm) llvm-mc compatibility fix for nacl_text_pad_test.S
r7397: (noelallen) Bump Chrome 113806
r7399: (noelallen) Disable sel_universal tests broken by Chrome.
r7400: (jvoung) Pass arch argument along to pre-req checker in the all()
r7401: (mcgrathr) Remove unused next_outgoing_request_id member from struct NaClSrpcChannel
r7402: (pdox) Augment initfini test by adding 3 function pointers to each array. This will catch bugs in which preinit/init/fini_array elements are skipped due to pointer alignment/size issues.
r7403: (noelallen) Add ability to run test_hello_world_nexe for GLIBC
r7404: (pdox) Make elf_constants.h #includable without NACL_BUILD_ARCH/SUBARCH defined
r7405: (pdox) Tidy: Make NACL_x86/arm #defines more robust against NACL_BUILD_ARCH not being defined
r7406: (pdox) Revert 7405, due to broken gyp build.
r7407: (pdox) Merge with LLVM up to r146310.
r7408: (pdox) Add -Wno-array-bounds to SConstruct for PNaCl GlibC build.
r7409: (halyavin) Implement exception handling for stand-alone sel_ldr on Win32.
r7410: (jvoung) Roll toolchain DEPs.
r7412: (krasin) Add test for wcstoll.c which is currently broken for glibc.
r7413: (krasin) Revert 7412 - Add test for wcstoll.c which is currently broken for glibc.
r7414: (mcgrathr) Factor nameservice lookup out of manifest lookup code in IRT
r7415: (noelallen) Newlib buildbots RED due to dependency on glibc toolchain.
r7416: (krasin) Add test for wcstoll.c which is currently broken for glibc.
r7417: (mcgrathr) Filter -fstack-protector out of cflags for nacl_helper_bootstrap
r7418: (ncbray) Fix a indenting bug in build/chromebinaries.py.
r7419: (noelallen) Trivial fix to prevent recompile of toolchain .S files.
r7420: (mcgrathr) Update chrome_rev in DEPS
r7422: (mcgrathr) Add IRT interface for random number generator
r7423: (mcgrathr) Update glibc revision to daf2032
r7424: (krasin) Update llvm rev to caa4d07e5a3f. This bring in: revert local mod in arm mc.
r7425: (mcgrathr) Add a test that pthread_cleanup_push doesn't clobber nearby stack
r7426: (krasin) Revert 7424 - Update llvm rev to caa4d07e5a3f. This bring in: revert local mod in arm mc.
r7427: (pdox) Merge with LLVM up to r146520.
r7428: (pdox) Roll toolchain DEPS and commit test changes for CL:
r7430: (pdox) Whitespace change to trigger rebuild.
r7431: (mseaborn) Remove unused #define NACL_NO_INLINE
r7432: (pdox) Merge with LLVM up to r146552.
r7433: (dschuff) First step in refactoring.
r7434: (mcgrathr) Don't expect RNG to produce two different values for subsequent byte reads
r7435: (mcgrathr) Update glibc revision to 3c8d1f2
r7436: (kschimpf) Add pre/post conditions for unit testing of the validator for LEA instruction.
r7437: (mseaborn) Mac crash reporting: Add interface for distinguishing trusted/untrusted crashes
r7438: (mcgrathr) Bump toolchain DEPS, enable no-longer-broken tests
r7440: (bsy) NaCl-side changes for stdout/err redirection to postmessage.
r7441: (dschuff) Update bot name for pnacl toolchain tests, should cause bot to run
r7442: (dschuff) Add PNACL_BUILDBOT to tester env
r7443: (sehr) Add reverse channel support to sel_universal. This will allow emulation of
r7444: (pdox) Add bias (architecture-specific defines, __x86_64__) to pthread_cleanup_test (for PNaCl GlibC build).
r7445: (pdox) Use the PNaCl-built crtbegin.o/crtend.o/crti.bc for GlibC build.
r7446: (sehr) Enable LD manifest name service change.
BUG=none
TEST=nacl_integration
Review URL: http://codereview.chromium.org/8953023
TBR=mseaborn@chromium.org
Review URL: http://codereview.chromium.org/8949023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r-- | DEPS | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -8,7 +8,7 @@ vars = { "webkit_revision": "102911", "chromium_git": "http://git.chromium.org/git", "swig_revision": "69281", - "nacl_revision": "7446", + "nacl_revision": "7388", # After changing nacl_revision, run 'glient sync' and check native_client/DEPS # to update other nacl_*_revision's. "nacl_tools_revision": "7139", # native_client/DEPS: tools_rev |