Switch to using the LLVM gold plugin as a fully linked-in object rather than DSO.

pnacl/build.sh

 #!/bin/bash
 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 #@                 Untrusted Toolchain Manager
 #@-------------------------------------------------------------------
 #@ This script builds the ARM and PNaCl untrusted toolchains.
 #@ It MUST be run from the native_client/ directory.
 ######################################################################
@@ skipping 158 matching lines @@
 readonly LLVM_INSTALL_DIR="${INSTALL_PKG}/llvm"
 readonly GCC_INSTALL_DIR="${INSTALL_PKG}/gcc"
 readonly GMP_INSTALL_DIR="${INSTALL_PKG}/gmp"
 readonly MPFR_INSTALL_DIR="${INSTALL_PKG}/mpfr"
 readonly MPC_INSTALL_DIR="${INSTALL_PKG}/mpc"
 readonly BINUTILS_INSTALL_DIR="${INSTALL_PKG}/binutils"
 readonly BFD_PLUGIN_DIR="${BINUTILS_INSTALL_DIR}/lib/bfd-plugins"
 readonly SYSROOT_DIR="${INSTALL_NEWLIB}/sysroot"
 readonly FAKE_INSTALL_DIR="${INSTALL_PKG}/fake"
 
+readonly LLVM_GOLD_PLUGIN_DIR="${LLVM_INSTALL_DIR}"/plugin
+readonly LLVM_GOLD_PLUGIN="${LLVM_GOLD_PLUGIN_DIR}"/gold-plugin-static.o
+
 # TODO(pdox): Consider getting rid of pnacl-ld libmode bias,
 #             and merging these two.
 readonly PNACL_LD_NEWLIB="${INSTALL_NEWLIB_BIN}/pnacl-ld"
 readonly PNACL_LD_GLIBC="${INSTALL_GLIBC_BIN}/pnacl-ld"
 
 # These driver tools are always pulled from newlib/bin,
 # but this should not introduce a bias.
 readonly PNACL_PP="${INSTALL_NEWLIB_BIN}/pnacl-clang -E"
 readonly PNACL_AR="${INSTALL_NEWLIB_BIN}/pnacl-ar"
 readonly PNACL_RANLIB="${INSTALL_NEWLIB_BIN}/pnacl-ranlib"
@@ skipping 58 matching lines @@
 # which can then be translated to each individual architecture.
 SBTC_PRODUCTION=${SBTC_PRODUCTION:-false}
 
 # Which toolchain to use for each arch.
 SBTC_BUILD_WITH_PNACL="arm x8632 x8664"
 if ${PNACL_IN_CROS_CHROOT}; then
   SBTC_BUILD_WITH_PNACL="arm"
 fi
 
 # Current milestones in each repo
-readonly UPSTREAM_REV=${UPSTREAM_REV:-1de82863028c}
+readonly UPSTREAM_REV=${UPSTREAM_REV:-fb48564375b4}
 
 readonly NEWLIB_REV=346ea38d142f
-readonly BINUTILS_REV=ae568f8eb6e0
+readonly BINUTILS_REV=3cd8f04ea3b2
 readonly COMPILER_RT_REV=1a3a6ffb31ea
 
 readonly LLVM_PROJECT_REV=${LLVM_PROJECT_REV:-147864}
 readonly LLVM_MASTER_REV=${LLVM_PROJECT_REV}
 readonly CLANG_REV=${LLVM_PROJECT_REV}
 readonly DRAGONEGG_REV=${LLVM_PROJECT_REV}
 
 # Repositories
 readonly REPO_UPSTREAM="nacl-llvm-branches.upstream"
 readonly REPO_NEWLIB="nacl-llvm-branches.newlib"
 readonly REPO_BINUTILS="nacl-llvm-branches.binutils"
 readonly REPO_COMPILER_RT="nacl-llvm-branches.compiler-rt"
 
 # LLVM repos (svn)
 readonly REPO_LLVM_MASTER="http://llvm.org/svn/llvm-project/llvm/trunk"
 readonly REPO_CLANG="http://llvm.org/svn/llvm-project/cfe/trunk"
 readonly REPO_DRAGONEGG="http://llvm.org/svn/llvm-project/dragonegg/trunk"
 
 CC=${CC:-gcc}
 CXX=${CXX:-g++}
+AR=${AR:-ar}
 if ${HOST_ARCH_X8632} ; then
   # These are simple compiler wrappers to force 32bit builds
   # For bots and releases we build the toolchains
   # on the oldest system we care to support. Currently
   # that is a 32 bit hardy. The advantage of this is that we can build
   # the toolchain shared, reducing its size and allowing the use of
   # plugins. You can test them on your system by setting the
   # environment variable HOST_ARCH=x86_32 on a 64 bit system.
   # Make sure you clean all your build dirs
   # before switching arches.
@@ skipping 505 matching lines @@
   mkdir -p "${INSTALL_ROOT}"
   # This is needed to build misc-tools and run ARM tests.
   # We check this early so that there are no surprises later, and we can
   # handle all user interaction early.
   check-for-trusted
 
   clean-install
 
   clean-logs
 
+  llvm
   binutils
-  llvm
   driver
 
   libs
 
   # NOTE: we delay the tool building till after the sdk is essentially
   #      complete, so that sdk sanity checks don't fail
   misc-tools
   verify
 }
 
@@ skipping 415 matching lines @@
 #+ llvm-install          - Install LLVM
 llvm-install() {
   StepBanner "LLVM" "Install"
 
   spushd "${TC_BUILD_LLVM}"
   llvm-link-clang
   RunWithLog llvm.install \
        make ${MAKE_OPTS} install
   spopd
 
-  llvm-install-links
+  llvm-install-plugin
 }
 
-llvm-install-links() {
-  local makelink="ln -sf"
+# Produces gold-plugin-static.o, which is the gold plugin
+# with all LLVM dependencies statically linked in.
+llvm-install-plugin() {
+  StepBanner "LLVM" "Installing plugin"
+  mkdir -p "${LLVM_GOLD_PLUGIN_DIR}"
 
-  # On Windows, these can't be symlinks.
-  if ${BUILD_PLATFORM_WIN}; then
-    makelink="cp -a"
-  fi
+  # This pulls every LLVM dependency needed for gold-plugin.o and libLTO.
+  local components="x86 arm linker analysis ipo bitwriter"
 
-  mkdir -p "${BFD_PLUGIN_DIR}"
+  ${CC} -r -nostdlib \
+         "${TC_BUILD_LLVM}"/tools/gold/Release+Asserts/gold-plugin.o \
+        -L "${TC_BUILD_LLVM}"/Release+Asserts/lib \
+        -Wl,-Bstatic \
+        -lLTO \
+        $("${LLVM_INSTALL_DIR}"/bin/llvm-config --libs ${components}) \
+        -o "${LLVM_GOLD_PLUGIN}"

[jvoung - send to chromium..., 2012/06/22 19:58:49]

Perhaps this shouldn't have been a single .o file (gold-plugin-static.o), but a
new static archive with libLTO + the gold-plugin.o.

Then, when we wouldn't have libLTO as a giant unit (a .o), when we build
binutils.

 
-  # TODO(pdox): These may no longer be necessary.
-  if [ -f "${BFD_PLUGIN_DIR}/../../../llvm/${SO_DIR}/LLVMgold${SO_EXT}" ]; then
-    # this is to make sure whatever name LLVMgold.so is, it is always
-    # libLLVMgold.so as far as PNaCl is concerned
-
-    StepBanner "Symlinking LLVMgold.so to libLLVMgold.so in " \
-     "${BFD_PLUGIN_DIR}/../../../llvm/${SO_DIR}"
-
-    (cd "${BFD_PLUGIN_DIR}/../../../llvm/${SO_DIR}";
-      ${makelink} "LLVMgold${SO_EXT}" "${SO_PREFIX}LLVMgold${SO_EXT}";
-    )
-  fi
-
-  spushd "${BFD_PLUGIN_DIR}"
-
-  ${makelink} ../../../llvm/${SO_DIR}/${SO_PREFIX}LLVMgold${SO_EXT} .
-  ${makelink} ../../../llvm/${SO_DIR}/${SO_PREFIX}LTO${SO_EXT} .
-  spopd
-
-  spushd "${BINUTILS_INSTALL_DIR}/${SO_DIR}"
-  ${makelink} ../../llvm/${SO_DIR}/${SO_PREFIX}LTO${SO_EXT} .
-  ${makelink} ../../llvm/${SO_DIR}/${SO_PREFIX}LLVMgold${SO_EXT} .
-  spopd
+  # Force re-link of ld, gold, ar, ranlib, nm
+  rm -f "${TC_BUILD_BINUTILS}"/binutils/ar
+  rm -f "${TC_BUILD_BINUTILS}"/binutils/nm-new
+  rm -f "${TC_BUILD_BINUTILS}"/binutils/ranlib
+  rm -f "${TC_BUILD_BINUTILS}"/gold/ld-new
+  rm -f "${TC_BUILD_BINUTILS}"/ld/ld-new
 }
 
 #########################################################################
 #########################################################################
 # GCC/DragonEgg based front-end
 #########################################################################
 #########################################################################
 
 ###############################  GMP  ###############################
 #+ gmp                   - Build and install gmp
@@ skipping 666 matching lines @@
 
   assert-dir "${srcdir}" "You need to checkout binutils."
 
   if binutils-needs-configure; then
     binutils-clean
     binutils-configure
   else
     SkipBanner "BINUTILS" "configure"
   fi
 
-  if binutils-needs-make; then
-    binutils-make
-  else
-    SkipBanner "BINUTILS" "make"
-  fi
-
+  binutils-dlwrap
+  binutils-make
   binutils-install
 }
 
 #+ binutils-clean    - Clean binutils
 binutils-clean() {
   StepBanner "BINUTILS" "Clean"
   local objdir="${TC_BUILD_BINUTILS}"
   rm -rf ${objdir}
 }
 
+binutils-dlwrap() {
+  local srcdir="${TC_SRC_BINUTILS}"
+  local objdir="${TC_BUILD_BINUTILS}"
+
+  if ! [ -f "${LLVM_GOLD_PLUGIN}" ]; then
+    Fatal "LLVM must be installed before building binutils."
+  fi
+
+  # Build libdlwrap.a
+  mkdir -p "${objdir}/dlwrap"
+  spushd "${objdir}/dlwrap"
+  ${CC} -c "${srcdir}"/dlwrap/dlwrap.c -o dlwrap.o
+  cp "${LLVM_GOLD_PLUGIN}" gold_plugin_static.o
+  ${AR} crs libdlwrap.a dlwrap.o gold_plugin_static.o
+  spopd
+}
+
 #+ binutils-configure- Configure binutils for ARM
 binutils-configure() {
   StepBanner "BINUTILS" "Configure"
 
   local srcdir="${TC_SRC_BINUTILS}"
   local objdir="${TC_BUILD_BINUTILS}"
 
   # enable multiple targets so that we can use the same ar with all .o files
   local targ="arm-pc-nacl,i686-pc-nacl,x86_64-pc-nacl"
   mkdir -p "${objdir}"
   spushd "${objdir}"
 
   # The --enable-gold and --enable-plugins options are on so that we
   # can use gold's support for plugin to link PNaCl modules.
 
   # TODO(pdox): Building binutils for nacl/nacl64 target currently requires
   # providing NACL_ALIGN_* defines. This should really be defined inside
   # binutils instead.
+  local flags="-DNACL_ALIGN_BYTES=32 -DNACL_ALIGN_POW2=5 \
+               -I${TC_SRC_BINUTILS}/dlwrap -DENABLE_DLWRAP"
   RunWithLog binutils.configure \
     env -i \
     PATH="/usr/bin:/bin" \
     CC="${CC}" \
     CXX="${CXX}" \
-    CFLAGS="-DNACL_ALIGN_BYTES=32 -DNACL_ALIGN_POW2=5" \
+    LDFLAGS="-L${objdir}/dlwrap" \
+    CFLAGS="${flags}" \
+    CXXFLAGS="${flags}" \
     ${srcdir}/binutils-2.20/configure --prefix="${BINUTILS_INSTALL_DIR}" \
                                       --target=${BINUTILS_TARGET} \
                                       --enable-targets=${targ} \
                                       --enable-gold=yes \
                                       --enable-ld=yes \
                                       --enable-plugins \
                                       --disable-werror \
                                       --with-sysroot="${NONEXISTENT_PATH}"
   # There's no point in setting the correct path as sysroot, because we
   # want the toolchain to be relocatable. The driver will use ld command-line
   # option --sysroot= to override this value and set it to the correct path.
   # However, we need to include --with-sysroot during configure to get this
   # option. So fill in a non-sense, non-existent path.
 
   spopd
 }
 
 binutils-needs-configure() {
   [ ! -f "${TC_BUILD_BINUTILS}/config.status" ]
   return $?
 }
 
-binutils-needs-make() {
-  local srcdir="${TC_SRC_BINUTILS}"
-  local objdir="${TC_BUILD_BINUTILS}"
-  local ret=1
-  binutils-mess-hide
-  ts-modified "$srcdir" "$objdir" && ret=0
-  binutils-mess-unhide
-  return ${ret}
-}
-
 #+ binutils-make     - Make binutils for ARM
 binutils-make() {
   StepBanner "BINUTILS" "Make"
   local srcdir="${TC_SRC_BINUTILS}"
   local objdir="${TC_BUILD_BINUTILS}"
   spushd "${objdir}"
 
   ts-touch-open "${objdir}"
 
   RunWithLog binutils.make \
@@ skipping 551 matching lines @@
       env -i \
       PATH="/usr/bin:/bin" \
       ${srcdir}/binutils-2.20/configure \
         "${BINUTILS_SB_CONFIGURE_ENV[@]}" \
         --prefix=${installdir} \
         --host=nacl \
         --target=${BINUTILS_TARGET} \
         --enable-targets=${BINUTILS_SB_ELF_TARGETS} \
         --disable-nls \
         --disable-werror \
+        --disable-plugins \
         --enable-static \
         --enable-shared=no
   spopd
 }
 
 binutils-sb-needs-make() {
   binutils-sb-setup "$@"
   ts-modified "${TC_SRC_BINUTILS}" "${BINUTILS_SB_OBJDIR}"
   return $?
 }
@@ skipping 1274 matching lines @@
   #Usage
   echo "ERROR: unknown function '$1'." >&2
   echo "For help, try:"
   echo "    $0 help"
   exit 1
 fi
 
 hg-migrate
 
 "$@"