[XRay] Stop running tests for 'amd64', and remove -fPIE from tests.

Follow-up to D38226.

llvm-svn: 314189

diff --git a/clang/test/Driver/XRay/lit.local.cfg b/clang/test/Driver/XRay/lit.local.cfg
index 56420cf..85e1ee7 100644 (file)
--- a/clang/test/Driver/XRay/lit.local.cfg
+++ b/clang/test/Driver/XRay/lit.local.cfg
@@ -3,8 +3,8 @@ config.available_features.update(target_triple_components)
 
 # Only run the tests in platforms where XRay instrumentation is supported.
 supported_targets = [
-    'amd64', 'x86_64', 'x86_64h', 'arm', 'aarch64', 'arm64', 'powerpc64le',
-    'mips', 'mipsel', 'mips64', 'mips64el'
+    'x86_64', 'x86_64h', 'arm', 'aarch64', 'arm64', 'powerpc64le', 'mips',
+    'mipsel', 'mips64', 'mips64el'
 ]
 
 # Only on platforms we support.

diff --git a/clang/test/Driver/XRay/xray-shared-noxray.cpp b/clang/test/Driver/XRay/xray-shared-noxray.cpp
index 564df88..dc6f8a1 100644 (file)
--- a/clang/test/Driver/XRay/xray-shared-noxray.cpp
+++ b/clang/test/Driver/XRay/xray-shared-noxray.cpp
@@ -2,8 +2,6 @@
 // RUN:     FileCheck %s --check-prefix=SHARED
 // RUN: %clangxx -static -o /dev/null -v -fxray-instrument %s 2>&1 -DMAIN | \
 // RUN:     FileCheck %s --check-prefix=STATIC
-// RUN: %clangxx -static -fPIE -o /dev/null -v -fxray-instrument %s 2>&1 \
-// RUN:     -DMAIN | FileCheck %s --check-prefix=STATIC
 //
 // SHARED-NOT: {{clang_rt\.xray-}}
 // STATIC: {{clang_rt\.xray-}}