From 23851940e5a71054962b64102fc793dfc8150c36 Mon Sep 17 00:00:00 2001 From: Ryan Govostes Date: Tue, 29 Mar 2016 18:27:24 +0000 Subject: [PATCH] Revert "[asan] Make the global_metadata_darwin.ll test require El Capitan or newer" llvm-svn: 264764 --- .../AddressSanitizer/global_metadata_darwin.ll | 1 - llvm/test/lit.cfg | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/llvm/test/Instrumentation/AddressSanitizer/global_metadata_darwin.ll b/llvm/test/Instrumentation/AddressSanitizer/global_metadata_darwin.ll index ecf7830..8bf17ca 100644 --- a/llvm/test/Instrumentation/AddressSanitizer/global_metadata_darwin.ll +++ b/llvm/test/Instrumentation/AddressSanitizer/global_metadata_darwin.ll @@ -2,7 +2,6 @@ ; allowing dead stripping to be performed, and that the appropriate runtime ; routines are invoked. -; REQUIRES: ld64_live_support ; RUN: opt < %s -asan -asan-module -S | FileCheck %s target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" diff --git a/llvm/test/lit.cfg b/llvm/test/lit.cfg index 83cce65..c1a4499 100644 --- a/llvm/test/lit.cfg +++ b/llvm/test/lit.cfg @@ -429,18 +429,6 @@ def have_ld64_plugin_support(): if have_ld64_plugin_support(): config.available_features.add('ld64_plugin') - -# Check if ld64 knows about live_support (OS X El Capital and newer). -if config.host_os == 'Darwin': - try: - osx_version = subprocess.check_output(["sw_vers", "-productVersion"]) - osx_version = tuple(int(x) for x in osx_version.split('.')) - if osx_version >= (10, 11): - config.available_features.add('ld64_live_support') - except: - pass - - # Ask llvm-config about assertion mode. try: llvm_config_cmd = subprocess.Popen( -- 2.7.4