diff options
author | mithro@mithis.com <mithro@mithis.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 07:53:30 +0000 |
---|---|---|
committer | mithro@mithis.com <mithro@mithis.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 07:53:30 +0000 |
commit | 24cf63bc511e3836197422018eee8d3c2b28fbec (patch) | |
tree | 7da823db66f16cf444d9070aef6f71296f075968 /third_party | |
parent | 507690d54f0728a131e069725b5e7849d8ba8768 (diff) | |
download | chromium_src-24cf63bc511e3836197422018eee8d3c2b28fbec.zip chromium_src-24cf63bc511e3836197422018eee8d3c2b28fbec.tar.gz chromium_src-24cf63bc511e3836197422018eee8d3c2b28fbec.tar.bz2 |
Original revision r259507 info
--------------------------------------------------------------------------
Enabling debug fission for Chrome debug builds helps with two significant
problems with Chrome debug builds,
* Slow link times.
* Slow gdb startup times.
Lots more detailed information at http://gcc.gnu.org/wiki/DebugFission
Debug fission requires a objcopy with --extract-dwo object (binutils newer then
2.22.52.0.4 // 2.23). Ubuntu Precise only comes with 2.22.43
--------------------------------------------------------------------------
Updates include fixing the LICENSE header for binutils build scripts (and updating README.chromium).
Fixes the following issues;
--------------------------------------------------------------------------
python src/tools/checklicenses/checklicenses.py --root src
in dir /b/build/slave/Linux/build (timeout 600 secs) (maxTime 28800 secs)
Using base directory: src
Checking: src
'third_party/binutils/build-one.sh' has non-whitelisted license 'UNKNOWN'
'third_party/binutils/build-all.sh' has non-whitelisted license 'UNKNOWN'
'third_party/binutils/upload.sh' has non-whitelisted license 'UNKNOWN'
FAILED
Please read http://www.chromium.org/developers/adding-3rd-party-libraries
for more info how to handle the failure.
Please respect OWNERS of checklicenses.py. Changes violating
this requirement may be reverted.
--------------------------------------------------------------------------
BUG=356695,352046
Review URL: https://codereview.chromium.org/213933002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259818 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r-- | third_party/binutils/.gitignore | 3 | ||||
-rw-r--r-- | third_party/binutils/LICENSE | 340 | ||||
-rw-r--r-- | third_party/binutils/OWNERS | 3 | ||||
-rw-r--r-- | third_party/binutils/README.chromium | 22 | ||||
-rwxr-xr-x | third_party/binutils/build-all.sh | 117 | ||||
-rwxr-xr-x | third_party/binutils/build-one.sh | 19 | ||||
-rw-r--r-- | third_party/binutils/ehframe.patch | 49 | ||||
-rw-r--r-- | third_party/binutils/linux/.keepme | 0 | ||||
-rwxr-xr-x | third_party/binutils/upload.sh | 25 |
9 files changed, 578 insertions, 0 deletions
diff --git a/third_party/binutils/.gitignore b/third_party/binutils/.gitignore new file mode 100644 index 0000000..4dfd3b6 --- /dev/null +++ b/third_party/binutils/.gitignore @@ -0,0 +1,3 @@ +binutils-* +*-chroot-* +output-* diff --git a/third_party/binutils/LICENSE b/third_party/binutils/LICENSE new file mode 100644 index 0000000..4a1bd6f --- /dev/null +++ b/third_party/binutils/LICENSE @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/third_party/binutils/OWNERS b/third_party/binutils/OWNERS new file mode 100644 index 0000000..41edd86 --- /dev/null +++ b/third_party/binutils/OWNERS @@ -0,0 +1,3 @@ +thakis@chromium.org +thestig@chromium.org +mithro@mithis.com diff --git a/third_party/binutils/README.chromium b/third_party/binutils/README.chromium new file mode 100644 index 0000000..b681b07 --- /dev/null +++ b/third_party/binutils/README.chromium @@ -0,0 +1,22 @@ +Name: binutils +URL: http://www.gnu.org/software/binutils/ +Version: 2.24 +License: GPL v2 +License File: NOT_SHIPPED +Security Critical: no + +Description: +This directory contains i386 and amd64 binaries of the binutils tools +(including gold linker). + +They were built from binutils-2.24 using the "build-all.sh" script on a Ubuntu +Precise. + +The script creates chroots for 32bit and 64bit Ubuntu Lucid and then builds +binutils inside the roots. + +Local patches: + * ehframe.patch for http://crbug.com/161942 + + * (build-all.sh|build-one.sh|upload.sh) scripts for building the binutils + binaries and uploading them to Google storage. diff --git a/third_party/binutils/build-all.sh b/third_party/binutils/build-all.sh new file mode 100755 index 0000000..fe49e6d --- /dev/null +++ b/third_party/binutils/build-all.sh @@ -0,0 +1,117 @@ +#!/bin/sh +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# Script to build binutils for both i386 and AMD64 Linux architectures. +# Must be run on an AMD64 supporting machine which has debootstrap and sudo +# installed. +# Uses Ubuntu Lucid chroots as build environment. + +set -e + +if [ x"$(whoami)" = x"root" ]; then + echo "Script must not be run as root." + exit 1 +fi +sudo -v + +OUTPUTDIR="${1:-$PWD/output-$(date +%Y%m%d-%H%M%S)}" +if [ ! -d "$OUTPUTDIR" ]; then + mkdir -p "$OUTPUTDIR" +fi + +# Download the source +VERSION=2.24 +wget -c http://ftp.gnu.org/gnu/binutils/binutils-$VERSION.tar.bz2 + +# Verify the signature +wget -c -q http://ftp.gnu.org/gnu/binutils/binutils-$VERSION.tar.bz2.sig +if ! gpg --verify binutils-$VERSION.tar.bz2.sig; then + echo "GPG Signature failed to verify." + echo "" + echo "You may need to import the vendor GPG key with:" + echo "# gpg --keyserver pgp.mit.edu --recv-key 4AE55E93" + exit 1 +fi + + +if [ ! -d binutils-$VERSION ]; then + # Extract the source + tar jxf binutils-$VERSION.tar.bz2 + + # Patch the source + ( + cd binutils-$VERSION + patch -p1 < ../ehframe.patch + ) +fi + +for ARCH in i386 amd64; do + if [ ! -d lucid-chroot-$ARCH ]; then + # Refresh sudo credentials + sudo -v + + # Create the chroot + echo "" + echo "Building chroot for $ARCH" + echo "=============================" + sudo debootstrap \ + --arch=$ARCH \ + --include=build-essential,flex,bison \ + lucid lucid-chroot-$ARCH + echo "=============================" + fi + + BUILDDIR=lucid-chroot-$ARCH/build + + # Clean up any previous failed build attempts inside chroot + if [ -d "$BUILDDIR" ]; then + sudo rm -rf "$BUILDDIR" + fi + + # Copy data into the chroot + sudo mkdir -p "$BUILDDIR" + sudo cp -a binutils-$VERSION "$BUILDDIR" + sudo cp -a build-one.sh "$BUILDDIR" + + # Do the build + PREFIX= + case $ARCH in + i386) + PREFIX="setarch linux32" + ARCHNAME=i686-pc-linux-gnu + ;; + amd64) + PREFIX="setarch linux64" + ARCHNAME=x86_64-unknown-linux-gnu + ;; + esac + echo "" + echo "Building binutils for $ARCH" + LOGFILE="$OUTPUTDIR/build-$ARCH.log" + if ! sudo $PREFIX chroot lucid-chroot-$ARCH /build/build-one.sh /build/binutils-$VERSION > $LOGFILE 2>&1; then + echo "Build failed! See $LOGFILE for details." + exit 1 + fi + + # Copy data out of the chroot + sudo chown -R $(whoami) "$BUILDDIR/output/" + + # Strip the output binaries + for i in "$BUILDDIR/output/$ARCHNAME/bin/*"; do + strip $i + done + + # Copy them out of the chroot + cp -a "$BUILDDIR/output/$ARCHNAME" "$OUTPUTDIR" + + # Clean up chroot + sudo rm -rf "$BUILDDIR" +done + +echo "Check you are happy with the binaries in" +echo " $OUTPUTDIR" +echo "Then" +echo " * upload to Google Storage using the upload.sh script" +echo " * roll dependencies" diff --git a/third_party/binutils/build-one.sh b/third_party/binutils/build-one.sh new file mode 100755 index 0000000..191a88d --- /dev/null +++ b/third_party/binutils/build-one.sh @@ -0,0 +1,19 @@ +#!/bin/sh +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# Script to build binutils found in /build/binutils-XXXX when inside a chroot. +# Don't call this script yourself, instead use the build-all.sh script. + +set -e + +if [ -z "$1" ]; then + echo "Directory of binutils not given." + exit 1 +fi + +cd "$1" +./configure --enable-gold=default --enable-threads --prefix=/build/output +make -j8 all +make install diff --git a/third_party/binutils/ehframe.patch b/third_party/binutils/ehframe.patch new file mode 100644 index 0000000..428a623 --- /dev/null +++ b/third_party/binutils/ehframe.patch @@ -0,0 +1,49 @@ +diff --git a/gold/ehframe.cc b/gold/ehframe.cc +index 08a9ec6..be262bf 100644 +--- a/gold/ehframe.cc ++++ b/gold/ehframe.cc +@@ -84,7 +84,8 @@ Eh_frame_hdr::Eh_frame_hdr(Output_section* eh_frame_section, + eh_frame_section_(eh_frame_section), + eh_frame_data_(eh_frame_data), + fde_offsets_(), +- any_unrecognized_eh_frame_sections_(false) ++ any_unrecognized_eh_frame_sections_(false), ++ lock_(NULL) + { + } + +@@ -102,6 +103,9 @@ Eh_frame_hdr::set_final_data_size() + this->fde_offsets_.reserve(fde_count); + } + this->set_data_size(data_size); ++ // We need a lock for updating the fde_offsets_ vector while writing ++ // the FDEs. ++ this->lock_ = new Lock(); + } + + // Write the data to the file. +diff --git a/gold/ehframe.h b/gold/ehframe.h +index 8aab8b8..d5ac668 100644 +--- a/gold/ehframe.h ++++ b/gold/ehframe.h +@@ -60,7 +60,10 @@ class Eh_frame_hdr : public Output_section_data + record_fde(section_offset_type fde_offset, unsigned char fde_encoding) + { + if (!this->any_unrecognized_eh_frame_sections_) +- this->fde_offsets_.push_back(std::make_pair(fde_offset, fde_encoding)); ++ { ++ Hold_lock(*this->lock_); ++ this->fde_offsets_.push_back(std::make_pair(fde_offset, fde_encoding)); ++ } + } + + protected: +@@ -157,6 +160,8 @@ class Eh_frame_hdr : public Output_section_data + // Whether we found any .eh_frame sections which we could not + // process. + bool any_unrecognized_eh_frame_sections_; ++ // Lock held while updating fde_offsets_. ++ Lock* lock_; + }; + + // This class holds an FDE. diff --git a/third_party/binutils/linux/.keepme b/third_party/binutils/linux/.keepme new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/third_party/binutils/linux/.keepme diff --git a/third_party/binutils/upload.sh b/third_party/binutils/upload.sh new file mode 100755 index 0000000..27c11ce --- /dev/null +++ b/third_party/binutils/upload.sh @@ -0,0 +1,25 @@ +#!/bin/sh +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# Upload the generated output to Google storage. + +if [ ! -d $1 ]; then + echo "update.sh <output directory from build-all.sh>" + exit 1 +fi + +if [ ! -f ~/.boto ]; then + echo "You need to run 'gsutil config' to set up authentication before running this script." + exit 1 +fi + +BINUTILS_TAR_BZ2=linux/binutils.tar.bz2 +if [ -f ${BINUTILS_TAR_BZ2}.sha1 ]; then + echo "Please remove ${BINUTILS_TAR_BZ2}.sha1 before starting..." + exit 1 +fi + +(cd $1/; tar -jcvf ../$BINUTILS_TAR_BZ2 .) +../depot_tools/upload_to_google_storage.py --bucket chromium-binutils $BINUTILS_TAR_BZ2 |