Revert "[nvptx] Fix ASM_SPEC workaround for sm_30"

This reverts commit bf4832d6fa817f66009f100a9cd68953062add7d.

diff --git a/gcc/config/nvptx/nvptx.h b/gcc/config/nvptx/nvptx.h
index 3b06f33032fdb121c1dcb8877f1284c588def39b..75ac7a666b1391bb5b443e171c3876e31af2b0f1 100644 (file)
--- a/gcc/config/nvptx/nvptx.h
+++ b/gcc/config/nvptx/nvptx.h
@@ -29,24 +29,10 @@
 
 #define STARTFILE_SPEC "%{mmainkernel:crt0.o}"
 
-/* Newer versions of CUDA no longer support sm_30, and nvptx-tools as
-   currently doesn't handle that gracefully when verifying
-   ( https://github.com/MentorEmbedded/nvptx-tools/issues/30 ).  Work around
-   this by verifying with sm_35 when having misa=sm_30 (either implicitly
-   or explicitly).  */
-#define ASM_SPEC                               \
-  "%{"                                         \
-  /* Explict misa=sm_30.  */                   \
-  "misa=sm_30:-m sm_35"                                \
-  /* Separator.         */                             \
-  "; "                                         \
-  /* Catch-all.         */                             \
-  "misa=*:-m %*"                               \
-  /* Separator.         */                             \
-  "; "                                         \
-  /* Implicit misa=sm_30.  */                  \
-  ":-m sm_35"                                  \
-  "}"
+/* Default needs to be in sync with default for misa in nvptx.opt.
+   We add a default here to work around a hard-coded sm_30 default in
+   nvptx-as.  */
+#define ASM_SPEC "%{misa=*:-m %*; :-m sm_35}%{misa=sm_30:--no-verify}"
 
 #define TARGET_CPU_CPP_BUILTINS() nvptx_cpu_cpp_builtins ()