[libcxx-commits] [libcxx] b4b4259 - [libc++] update GCC cherry-pick to build 4.8.5

[Eric Fiselier via libcxx-commits]

Author: Eric Fiselier
Date: 2020-02-28T13:36:35-05:00
New Revision: b4b4259a49218c3a96a84b3f80eb584a9fcb1ce2

URL: https://github.com/llvm/llvm-project/commit/b4b4259a49218c3a96a84b3f80eb584a9fcb1ce2
DIFF: https://github.com/llvm/llvm-project/commit/b4b4259a49218c3a96a84b3f80eb584a9fcb1ce2.diff

LOG: [libc++] update GCC cherry-pick to build 4.8.5

Added: 
    

Modified: 
    libcxx/utils/docker/debian9/compilers.yml
    libcxx/utils/docker/debian9/scripts/build_gcc_version.sh

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/docker/debian9/compilers.yml b/libcxx/utils/docker/debian9/compilers.yml
index 506ca83a4d08..bc4917ade7de 100644
--- a/libcxx/utils/docker/debian9/compilers.yml
+++ b/libcxx/utils/docker/debian9/compilers.yml
@@ -15,7 +15,7 @@ services:
       args:
         branch: releases/gcc-4.8.5
         install_prefix: /opt/gcc-4.8.5
-        cherry_pick: ec1cc0263f156f70693a62cf17b254a0029f4852
+        cherry_pick: 3a27b4db566c2cde8e043220f3d2c5401159b10e
     image: ericwf/compiler:gcc-4.8.5
   gcc-4.9.4:
     build:

diff  --git a/libcxx/utils/docker/debian9/scripts/build_gcc_version.sh b/libcxx/utils/docker/debian9/scripts/build_gcc_version.sh
index a0ea9e62a506..b759373f0116 100755
--- a/libcxx/utils/docker/debian9/scripts/build_gcc_version.sh
+++ b/libcxx/utils/docker/debian9/scripts/build_gcc_version.sh
@@ -79,7 +79,6 @@ git clone --branch "$GCC_BRANCH" --single-branch --depth=1 git://gcc.gnu.org/git
 
 pushd "$GCC_SOURCE_DIR"
 if [ "$CHERRY_PICK" != "" ]; then
-  git checkout -b cherry-pick-branch
   git fetch origin master --unshallow # Urg, we have to get the entire history. This will take a while.
   git cherry-pick --no-commit -X theirs "$CHERRY_PICK"
 fi