Import libc++ 10.0.1 release.

7 files changed, 71 insertions, 93 deletions

diff --git a/gnu/llvm/libcxx/docs/DesignDocs/AvailabilityMarkup.rst b/gnu/llvm/libcxx/docs/DesignDocs/AvailabilityMarkup.rst
index 87ad0abb62d..f076dfecdaa 100644
--- a/gnu/llvm/libcxx/docs/DesignDocs/AvailabilityMarkup.rst
+++ b/gnu/llvm/libcxx/docs/DesignDocs/AvailabilityMarkup.rst
@@ -65,26 +65,37 @@ Some parameters can be passed to lit to run the test-suite and exercise the
 availability.
 
 * The `platform` parameter controls the deployment target. For example lit can
-  be invoked with `--param=platform=macosx10.12`. Default is the current host.
-* The `use_system_cxx_lib` parameter indicates that the test suite is being run
-  against a system library.
+  be invoked with `--param=platform=macosx10.8`. Default is the current host.
+* The `use_system_cxx_lib` parameter indicates to use another library than the
+  just built one. Invoking lit with `--param=use_system_cxx_lib=true` will run
+  the test-suite against the host system library. Alternatively a path to the
+  directory containing a specific prebuilt libc++ can be used, for example:
+  `--param=use_system_cxx_lib=/path/to/macOS/10.8/`.
 
 Tests can be marked as XFAIL based on multiple features made available by lit:
 
-* if `--param=platform=macosx10.12` is passed, the following features will be available:
 
+* if `--param=platform=macosx10.8` is passed, the following features will be available:
+
+  - availability
+  - availability=x86_64
   - availability=macosx
-  - availability=macosx10.12
+  - availability=x86_64-macosx
+  - availability=x86_64-apple-macosx10.8
+  - availability=macosx10.8
 
   This feature is used to XFAIL a test that *is* using a class or a method marked
   as unavailable *and* that is expected to *fail* if deployed on an older system.
 
-* if `use_system_cxx_lib` and `--param=platform=macosx10.12` are passed to lit,
+* if `use_system_cxx_lib` and `--param=platform=macosx10.8` are passed to lit,
   the following features will also be available:
 
+  - with_system_cxx_lib
+  - with_system_cxx_lib=x86_64
   - with_system_cxx_lib=macosx
-  - with_system_cxx_lib=macosx10.12
-  - with_system_cxx_lib=x86_64-apple-macosx10.12
+  - with_system_cxx_lib=x86_64-macosx
+  - with_system_cxx_lib=x86_64-apple-macosx10.8
+  - with_system_cxx_lib=macosx10.8
 
   This feature is used to XFAIL a test that is *not* using a class or a method
   marked as unavailable *but* that is expected to fail if deployed on an older
diff --git a/gnu/llvm/libcxx/lib/abi/x86_64-apple-darwin.v1.abilist b/gnu/llvm/libcxx/lib/abi/x86_64-apple-darwin.v1.abilist
index db06a4cc17c..2e405c9657e 100644
--- a/gnu/llvm/libcxx/lib/abi/x86_64-apple-darwin.v1.abilist
+++ b/gnu/llvm/libcxx/lib/abi/x86_64-apple-darwin.v1.abilist
@@ -2420,14 +2420,3 @@
 {'type': 'OBJECT', 'is_defined': True, 'name': '__ZTINSt3__14__fs10filesystem16filesystem_errorE', 'size': 0}
 {'type': 'OBJECT', 'is_defined': True, 'name': '__ZTSNSt3__14__fs10filesystem16filesystem_errorE', 'size': 0}
 {'type': 'OBJECT', 'is_defined': True, 'name': '__ZTVNSt3__14__fs10filesystem16filesystem_errorE', 'size': 0}
-{'type': 'FUNC', 'is_defined': True, 'name': '__ZNSt3__120__libcpp_atomic_waitEPVKNS_17__cxx_atomic_implIxNS_22__cxx_atomic_base_implIxEEEEx'}
-{'type': 'FUNC', 'is_defined': True, 'name': '__ZNSt3__120__libcpp_atomic_waitEPVKvx'}
-{'type': 'FUNC', 'is_defined': True, 'name': '__ZNSt3__123__cxx_atomic_notify_allEPVKNS_17__cxx_atomic_implIxNS_22__cxx_atomic_base_implIxEEEE'}
-{'type': 'FUNC', 'is_defined': True, 'name': '__ZNSt3__123__cxx_atomic_notify_allEPVKv'}
-{'type': 'FUNC', 'is_defined': True, 'name': '__ZNSt3__123__cxx_atomic_notify_oneEPVKNS_17__cxx_atomic_implIxNS_22__cxx_atomic_base_implIxEEEE'}
-{'type': 'FUNC', 'is_defined': True, 'name': '__ZNSt3__123__cxx_atomic_notify_oneEPVKv'}
-{'type': 'FUNC', 'is_defined': True, 'name': '__ZNSt3__123__libcpp_atomic_monitorEPVKNS_17__cxx_atomic_implIxNS_22__cxx_atomic_base_implIxEEEE'}
-{'type': 'FUNC', 'is_defined': True, 'name': '__ZNSt3__123__libcpp_atomic_monitorEPVKv'}
-{'type': 'FUNC', 'is_defined': True, 'name': '__ZNSt3__131__arrive_barrier_algorithm_baseEPNS_24__barrier_algorithm_baseEh'}
-{'type': 'FUNC', 'is_defined': True, 'name': '__ZNSt3__132__destroy_barrier_algorithm_baseEPNS_24__barrier_algorithm_baseE'}
-{'type': 'FUNC', 'is_defined': True, 'name': '__ZNSt3__134__construct_barrier_algorithm_baseERl'}
diff --git a/gnu/llvm/libcxx/lib/abi/x86_64-unknown-linux-gnu.v1.abilist b/gnu/llvm/libcxx/lib/abi/x86_64-unknown-linux-gnu.v1.abilist
index e646b86c199..8301cbfad1b 100644
--- a/gnu/llvm/libcxx/lib/abi/x86_64-unknown-linux-gnu.v1.abilist
+++ b/gnu/llvm/libcxx/lib/abi/x86_64-unknown-linux-gnu.v1.abilist
@@ -1917,14 +1917,3 @@
 {'is_defined': False, 'name': '__cxa_rethrow_primary_exception', 'type': 'FUNC'}
 {'is_defined': False, 'name': '__cxa_throw', 'type': 'FUNC'}
 {'is_defined': False, 'name': '__cxa_uncaught_exceptions', 'type': 'FUNC'}
-{'is_defined': True, 'type': 'FUNC', 'name': '_ZNSt3__132__destroy_barrier_algorithm_baseEPNS_24__barrier_algorithm_baseE'}
-{'is_defined': True, 'type': 'FUNC', 'name': '_ZNSt3__123__libcpp_atomic_monitorEPVKv'}
-{'is_defined': True, 'type': 'FUNC', 'name': '_ZNSt3__123__libcpp_atomic_monitorEPVKNS_17__cxx_atomic_implIiNS_22__cxx_atomic_base_implIiEEEE'}
-{'is_defined': True, 'type': 'FUNC', 'name': '_ZNSt3__123__cxx_atomic_notify_allEPVKv'}
-{'is_defined': True, 'type': 'FUNC', 'name': '_ZNSt3__123__cxx_atomic_notify_oneEPVKv'}
-{'is_defined': True, 'type': 'FUNC', 'name': '_ZNSt3__134__construct_barrier_algorithm_baseERl'}
-{'is_defined': True, 'type': 'FUNC', 'name': '_ZNSt3__120__libcpp_atomic_waitEPVKvi'}
-{'is_defined': True, 'type': 'FUNC', 'name': '_ZNSt3__123__cxx_atomic_notify_allEPVKNS_17__cxx_atomic_implIiNS_22__cxx_atomic_base_implIiEEEE'}
-{'is_defined': True, 'type': 'FUNC', 'name': '_ZNSt3__120__libcpp_atomic_waitEPVKNS_17__cxx_atomic_implIiNS_22__cxx_atomic_base_implIiEEEEi'}
-{'is_defined': True, 'type': 'FUNC', 'name': '_ZNSt3__131__arrive_barrier_algorithm_baseEPNS_24__barrier_algorithm_baseEh'}
-{'is_defined': True, 'type': 'FUNC', 'name': '_ZNSt3__123__cxx_atomic_notify_oneEPVKNS_17__cxx_atomic_implIiNS_22__cxx_atomic_base_implIiEEEE'}
diff --git a/gnu/llvm/libcxx/utils/ci/macos-backdeployment.sh b/gnu/llvm/libcxx/utils/ci/macos-backdeployment.sh
index d86337e4db3..6996af93434 100755
--- a/gnu/llvm/libcxx/utils/ci/macos-backdeployment.sh
+++ b/gnu/llvm/libcxx/utils/ci/macos-backdeployment.sh
@@ -4,16 +4,15 @@ set -ue
 
 function usage() {
   cat <<EOM
-$(basename ${0}) [-h|--help] --monorepo-root <MONOREPO-ROOT> --std <STD> --deployment-target <TARGET> [--libcxx-roots <DIR>] [--lit-args <ARGS...>] [--no-cleanup]
+$(basename ${0}) [-h|--help] --monorepo-root <MONOREPO-ROOT> --std <STD> --arch <ARCHITECTURE> --deployment-target <TARGET> --sdk-version <SDK-VERSION> [--lit-args <ARGS...>]
 
 This script is used to continually test the back-deployment use case of libc++ and libc++abi on MacOS.
 
-Specifically, this script runs the libc++ test suite against the just-built headers and linking against the just-built dylib, but it runs the tests against the dylibs for the given deployment target.
-
   --monorepo-root     Full path to the root of the LLVM monorepo. Both libc++ and libc++abi headers from the monorepo are used.
   --std               Version of the C++ Standard to run the tests under (c++03, c++11, etc..).
+  --arch              Architecture to build the tests for (32, 64).
   --deployment-target The deployment target to run the tests for. This should be a version number of MacOS (e.g. 10.12). All MacOS versions until and including 10.9 are supported.
-  [--libcxx-roots]    The path to previous libc++/libc++abi dylibs to use for back-deployment testing. Those are normally downloaded automatically, but if specified, this option will override the directory used. The directory should have the same layout as the roots downloaded automatically.
+  --sdk-version       The version of the SDK to test with. This should be a version number of MacOS (e.g. 10.12). We'll link against the libc++ dylib in that SDK, but we'll run against the one on the given deployment target.
   [--lit-args]        Additional arguments to pass to lit (optional). If there are multiple arguments, quote them to pass them as a single argument to this script.
   [--no-cleanup]      Do not cleanup the temporary directory that was used for testing at the end. This can be useful to debug failures. Make sure to clean up manually after.
   [-h, --help]        Print this help.
@@ -35,16 +34,20 @@ while [[ $# -gt 0 ]]; do
     STD="${2}"
     shift; shift
     ;;
+    --arch)
+    ARCH="${2}"
+    shift; shift
+    ;;
     --deployment-target)
     DEPLOYMENT_TARGET="${2}"
     shift; shift
     ;;
-    --lit-args)
-    ADDITIONAL_LIT_ARGS="${2}"
+    --sdk-version)
+    MACOS_SDK_VERSION="${2}"
     shift; shift
     ;;
-    --libcxx-roots)
-    PREVIOUS_DYLIBS_DIR="${2}"
+    --lit-args)
+    ADDITIONAL_LIT_ARGS="${2}"
     shift; shift
     ;;
     --no-cleanup)
@@ -65,9 +68,11 @@ done
 
 if [[ -z ${MONOREPO_ROOT+x} ]]; then echo "--monorepo-root is a required parameter"; usage; exit 1; fi
 if [[ -z ${STD+x} ]]; then echo "--std is a required parameter"; usage; exit 1; fi
+if [[ -z ${ARCH+x} ]]; then echo "--arch is a required parameter"; usage; exit 1; fi
 if [[ -z ${DEPLOYMENT_TARGET+x} ]]; then echo "--deployment-target is a required parameter"; usage; exit 1; fi
+if [[ -z ${MACOS_SDK_VERSION+x} ]]; then echo "--sdk-version is a required parameter"; usage; exit 1; fi
 if [[ -z ${ADDITIONAL_LIT_ARGS+x} ]]; then ADDITIONAL_LIT_ARGS=""; fi
-if [[ -z ${PREVIOUS_DYLIBS_DIR+x} ]]; then PREVIOUS_DYLIBS_DIR=""; fi
+
 
 TEMP_DIR="$(mktemp -d)"
 echo "Created temporary directory ${TEMP_DIR}"
@@ -89,6 +94,12 @@ PREVIOUS_DYLIBS_URL="http://lab.llvm.org:8080/roots/libcxx-roots.tar.gz"
 LLVM_TARBALL_URL="https://github.com/llvm-mirror/llvm/archive/master.tar.gz"
 
 
+echo "@@@ Configuring architecture-related stuff @@@"
+if [[ "${ARCH}" == "64" ]]; then CMAKE_ARCH_STRING="x86_64"; else CMAKE_ARCH_STRING="i386"; fi
+if [[ "${ARCH}" == "64" ]]; then LIT_ARCH_STRING="";         else LIT_ARCH_STRING="--param=enable_32bit=true"; fi
+echo "@@@@@@"
+
+
 echo "@@@ Configuring CMake @@@"
 mkdir -p "${LLVM_BUILD_DIR}"
 (cd "${LLVM_BUILD_DIR}" &&
@@ -97,46 +108,38 @@ mkdir -p "${LLVM_BUILD_DIR}"
     -GNinja \
     -DCMAKE_INSTALL_PREFIX="${LLVM_INSTALL_DIR}" \
     -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" \
-    -DCMAKE_OSX_ARCHITECTURES="x86_64" \
+    -DCMAKE_OSX_ARCHITECTURES="${CMAKE_ARCH_STRING}" \
     "${MONOREPO_ROOT}/llvm"
 )
 echo "@@@@@@"
 
 
-echo "@@@ Building and installing libc++ and libc++abi @@@"
-ninja -C "${LLVM_BUILD_DIR}" install-cxx install-cxxabi
+echo "@@@ Installing the latest libc++ headers @@@"
+ninja -C "${LLVM_BUILD_DIR}" install-cxx-headers
 echo "@@@@@@"
 
 
-if [[ ${PREVIOUS_DYLIBS_DIR} == "" ]]; then
-  echo "@@@ Downloading dylibs for older deployment targets @@@"
-  PREVIOUS_DYLIBS_DIR="${TEMP_DIR}/libcxx-dylibs"
-  mkdir "${PREVIOUS_DYLIBS_DIR}"
-  curl "${PREVIOUS_DYLIBS_URL}" | tar -xz --strip-components=1 -C "${PREVIOUS_DYLIBS_DIR}"
-  echo "@@@@@@"
-fi
-
-LIBCXX_ROOT_ON_DEPLOYMENT_TARGET="${PREVIOUS_DYLIBS_DIR}/macOS/libc++/${DEPLOYMENT_TARGET}"
-LIBCXXABI_ROOT_ON_DEPLOYMENT_TARGET="${PREVIOUS_DYLIBS_DIR}/macOS/libc++abi/${DEPLOYMENT_TARGET}"
+echo "@@@ Downloading dylibs for older deployment targets @@@"
+# TODO: We should also link against the libc++abi.dylib that was shipped in the SDK
+PREVIOUS_DYLIBS_DIR="${TEMP_DIR}/libcxx-dylibs"
+mkdir "${PREVIOUS_DYLIBS_DIR}"
+curl "${PREVIOUS_DYLIBS_URL}" | tar -xz --strip-components=1 -C "${PREVIOUS_DYLIBS_DIR}"
+LIBCXX_ON_DEPLOYMENT_TARGET="${PREVIOUS_DYLIBS_DIR}/macOS/${DEPLOYMENT_TARGET}/libc++.dylib"
+LIBCXXABI_ON_DEPLOYMENT_TARGET="${PREVIOUS_DYLIBS_DIR}/macOS/${DEPLOYMENT_TARGET}/libc++abi.dylib"
+LIBCXX_IN_SDK="${PREVIOUS_DYLIBS_DIR}/macOS/${MACOS_SDK_VERSION}/libc++.dylib"
+echo "@@@@@@"
 
-# Filesystem is supported on Apple platforms starting with macosx10.15.
-if [[ ${DEPLOYMENT_TARGET} =~ ^10.9|10.10|10.11|10.12|10.13|10.14$ ]]; then
-    ENABLE_FILESYSTEM="--param enable_filesystem=false"
-else
-    ENABLE_FILESYSTEM="--param enable_filesystem=true"
-fi
 
 # TODO: We need to also run the tests for libc++abi.
 echo "@@@ Running tests for libc++ @@@"
 "${LLVM_BUILD_DIR}/bin/llvm-lit" -sv "${MONOREPO_ROOT}/libcxx/test" \
                                  --param=enable_experimental=false \
-                                 ${ENABLE_FILESYSTEM} \
+                                 ${LIT_ARCH_STRING} \
                                  --param=cxx_headers="${LLVM_INSTALL_DIR}/include/c++/v1" \
                                  --param=std="${STD}" \
                                  --param=platform="macosx${DEPLOYMENT_TARGET}" \
-                                 --param=cxx_library_root="${LLVM_INSTALL_DIR}/lib" \
-                                 --param=cxx_runtime_root="${LIBCXX_ROOT_ON_DEPLOYMENT_TARGET}" \
-                                 --param=abi_library_path="${LIBCXXABI_ROOT_ON_DEPLOYMENT_TARGET}" \
-                                 --param=use_system_cxx_lib="True" \
+                                 --param=cxx_runtime_root="$(dirname "${LIBCXX_ON_DEPLOYMENT_TARGET}")" \
+                                 --param=abi_library_path="$(dirname "${LIBCXXABI_ON_DEPLOYMENT_TARGET}")" \
+                                 --param=use_system_cxx_lib="$(dirname "${LIBCXX_IN_SDK}")" \
                                  ${ADDITIONAL_LIT_ARGS}
 echo "@@@@@@"
diff --git a/gnu/llvm/libcxx/utils/ci/macos-trunk.sh b/gnu/llvm/libcxx/utils/ci/macos-trunk.sh
index dc977db9a84..7a5ee75e2b5 100755
--- a/gnu/llvm/libcxx/utils/ci/macos-trunk.sh
+++ b/gnu/llvm/libcxx/utils/ci/macos-trunk.sh
@@ -4,12 +4,13 @@ set -ue
 
 function usage() {
   cat <<EOM
-$(basename ${0}) [-h|--help] --monorepo-root <MONOREPO-ROOT> --std <STD> --libcxx-exceptions <ON|OFF> [--lit-args <ARGS...>]
+$(basename ${0}) [-h|--help] --monorepo-root <MONOREPO-ROOT> --std <STD> --arch <ARCHITECTURE> [--lit-args <ARGS...>]
 
 This script is used to continually test libc++ and libc++abi trunk on MacOS.
 
   --monorepo-root     Full path to the root of the LLVM monorepo. Both libc++ and libc++abi from the monorepo are used.
   --std               Version of the C++ Standard to run the tests under (c++03, c++11, etc..).
+  --arch              Architecture to build the tests for (32, 64).
   --libcxx-exceptions Whether to enable exceptions when building libc++ and running the libc++ tests. libc++abi is always built with support for exceptions because other libraries in the runtime depend on it (like libobjc). This must be ON or OFF.
   [--cmake-args]      Additional arguments to pass to CMake (both the libc++ and the libc++abi configuration). If there are multiple arguments, quote them to paass them as a single argument to this script.
   [--lit-args]        Additional arguments to pass to lit. If there are multiple arguments, quote them to pass them as a single argument to this script.
@@ -33,6 +34,10 @@ while [[ $# -gt 0 ]]; do
     STD="${2}"
     shift; shift
     ;;
+    --arch)
+    ARCH="${2}"
+    shift; shift
+    ;;
     --libcxx-exceptions)
     LIBCXX_EXCEPTIONS="${2}"
     shift; shift
@@ -63,6 +68,7 @@ done
 
 if [[ -z ${MONOREPO_ROOT+x} ]]; then echo "--monorepo-root is a required parameter"; usage; exit 1; fi
 if [[ -z ${STD+x} ]]; then echo "--std is a required parameter"; usage; exit 1; fi
+if [[ -z ${ARCH+x} ]]; then echo "--arch is a required parameter"; usage; exit 1; fi
 if [[ "${LIBCXX_EXCEPTIONS}" != "ON" && "${LIBCXX_EXCEPTIONS}" != "OFF" ]]; then echo "--libcxx-exceptions is a required parameter and must be either ON or OFF"; usage; exit 1; fi
 if [[ -z ${ADDITIONAL_CMAKE_ARGS+x} ]]; then ADDITIONAL_CMAKE_ARGS=""; fi
 if [[ -z ${ADDITIONAL_LIT_ARGS+x} ]]; then ADDITIONAL_LIT_ARGS=""; fi
@@ -86,6 +92,9 @@ LLVM_INSTALL_DIR="${TEMP_DIR}/llvm-install"
 
 echo "@@@ Setting up LIT flags @@@"
 LIT_FLAGS="-sv --param=std=${STD} ${ADDITIONAL_LIT_ARGS}"
+if [[ "${ARCH}" == "32" ]]; then
+  LIT_FLAGS+=" --param=enable_32bit=true"
+fi
 echo "@@@@@@"
 
 
@@ -101,7 +110,7 @@ mkdir -p "${LLVM_BUILD_DIR}"
     ${ADDITIONAL_CMAKE_ARGS} \
     -DLLVM_LIT_ARGS="${LIT_FLAGS}" \
     -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" \
-    -DCMAKE_OSX_ARCHITECTURES="x86_64" \
+    -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" \
     "${MONOREPO_ROOT}/llvm"
 )
 echo "@@@@@@"
@@ -121,18 +130,3 @@ echo "@@@@@@"
 echo "@@@ Running tests for libc++abi @@@"
 ninja -C "${LLVM_BUILD_DIR}" check-cxxabi
 echo "@@@@@@"
-
-
-# TODO: In the future, we should only build that way, and we should run the
-#       test suite against those.
-echo "@@@ Building libc++ and libc++abi using the Apple script (to make sure they work) @@@"
-"${MONOREPO_ROOT}/libcxx/utils/ci/apple-install-libcxx.sh"      \
-    --llvm-root "${MONOREPO_ROOT}"                              \
-    --build-dir "${LLVM_BUILD_DIR}/apple-build"                 \
-    --install-dir "${LLVM_BUILD_DIR}/apple-install"             \
-    --symbols-dir "${LLVM_BUILD_DIR}/apple-symbols"             \
-    --sdk macosx                                                \
-    --architectures "x86_64"                                    \
-    --version 999.99.99                                         \
-    --cache "${MONOREPO_ROOT}/libcxx/cmake/caches/Apple.cmake"
-echo "@@@@@@"
diff --git a/gnu/llvm/libcxx/utils/google-benchmark/README.LLVM b/gnu/llvm/libcxx/utils/google-benchmark/README.LLVM
index ea92eee202c..05c5e3ee343 100644
--- a/gnu/llvm/libcxx/utils/google-benchmark/README.LLVM
+++ b/gnu/llvm/libcxx/utils/google-benchmark/README.LLVM
@@ -14,11 +14,3 @@ Changes:
   is applied on top of
   https://github.com/google/benchmark/commit/4528c76b718acc9b57956f63069c699ae21edcab
   to fix cross-build from linux to windows via MinGW.
-* https://github.com/google/benchmark/commit/a77d5f70efaebe2b7e8c10134526a23a7ce7ef35
-  and
-  https://github.com/google/benchmark/commit/ecc1685340f58f7fe6b707036bc0bb1fccabb0c1
-  are applied on top of
-  https://github.com/google/benchmark/commit/8e48105d465c586068dd8e248fe75a8971c6ba3a
-  to fix timestamp-related inline asm issues and 32-bit RISC-V build failures.
-  The second cherrypicked commit fixes formatting issues introduced by the
-  preceding change.
diff --git a/gnu/llvm/libcxx/utils/sym_match.py b/gnu/llvm/libcxx/utils/sym_match.py
index e1fd28bd6a5..1fd39ca5f83 100755
--- a/gnu/llvm/libcxx/utils/sym_match.py
+++ b/gnu/llvm/libcxx/utils/sym_match.py
@@ -19,7 +19,7 @@ def main():
     parser = ArgumentParser(
         description='Extract a list of symbols from a shared library.')
     parser.add_argument(
-        '--exclusions', dest='exclusions',
+        '--blacklist', dest='blacklist',
         type=str, action='store', default=None)
     parser.add_argument(
         'symbol_list', metavar='symbol_list', type=str,
@@ -29,11 +29,11 @@ def main():
         help='The file containing the new symbol list or a library')
     args = parser.parse_args()
 
-    if not args.regexes and args.exclusions is None:
-        sys.stderr.write('Either a regex or a exclusions must be specified.\n')
+    if not args.regexes and args.blacklist is None:
+        sys.stderr.write('Either a regex or a blacklist must be specified.\n')
         sys.exit(1)
-    if args.exclusions:
-        search_list = util.read_exclusions(args.exclusions)
+    if args.blacklist:
+        search_list = util.read_blacklist(args.blacklist)
     else:
         search_list = args.regexes