From: ngie <ngie@FreeBSD.org>
Date: Fri, 30 Oct 2015 07:48:03 +0000 (+0000)
Subject: - Re-enable h_raw with clang 3.7.0+
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=968dafb4fcf133cb8beb6fa3c558fecd7dc00ef0;p=people%2Fjulieng%2Ffreebsd.git

- Re-enable h_raw with clang 3.7.0+
- Fix the compiler check to allow the test to be compiled for gcc

PR: 196430
MFC after: never
Sponsored by: EMC / Isilon Storage Division
---

diff --git a/lib/libc/tests/ssp/Makefile b/lib/libc/tests/ssp/Makefile
index ec7a82a48885..03c305b6e05a 100644
--- a/lib/libc/tests/ssp/Makefile
+++ b/lib/libc/tests/ssp/Makefile
@@ -26,7 +26,8 @@ PROGS+=		h_memmove
 PROGS+=		h_memset
 # This testcase doesn't run properly when not compiled with -fsantize=bounds
 # with clang, which is currently contingent on a compiler_rt update
-.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 30500
+.if (${COMPILER_TYPE} != "clang" || \
+     (${COMPILER_VERSION} < 30500 || 30700 <= ${COMPILER_VERSION}))
 PROGS+=		h_raw
 .endif
 PROGS+=		h_read