From 9fcc03e2b64dde04a82935ce2fd559a262498108 Mon Sep 17 00:00:00 2001
From: Maneesh Gupta <maneesh.gupta@amd.com>
Date: Fri, 7 Apr 2017 15:40:09 +0530
Subject: [PATCH] Merge branch 'amd-develop' into amd-master

Change-Id: I53d5a8916d769c4f0fe60d2ee3b240551da80b4f
(cherry picked from commit 01c523f6c9fc5a66d5f6e60d5efe78c29c9fe317)
---
 samples/0_Intro/bit_extract/Makefile          | 4 ----
 samples/1_Utils/hipCommander/Makefile         | 3 ---
 samples/1_Utils/hipCommander/hipCommander.cpp | 1 -
 3 files changed, 8 deletions(-)

diff --git a/samples/0_Intro/bit_extract/Makefile b/samples/0_Intro/bit_extract/Makefile
index 78f6a2faa8..08bca6e642 100644
--- a/samples/0_Intro/bit_extract/Makefile
+++ b/samples/0_Intro/bit_extract/Makefile
@@ -11,10 +11,6 @@ HIPCC=$(HIP_PATH)/bin/hipcc
 ifeq (${HIP_PLATFORM}, nvcc)
 	HIPCC_FLAGS = -gencode=arch=compute_20,code=sm_20 
 endif
-ifeq (${HIP_PLATFORM}, hcc)
-	HIPCC_FLAGS = -stdlib=libc++
-endif
-
 
 EXE=bit_extract
 
diff --git a/samples/1_Utils/hipCommander/Makefile b/samples/1_Utils/hipCommander/Makefile
index e770c636a4..a411763b7f 100644
--- a/samples/1_Utils/hipCommander/Makefile
+++ b/samples/1_Utils/hipCommander/Makefile
@@ -10,9 +10,6 @@ OPT=-O3
 CXXFLAGS =  $(OPT) --std=c++11
 
 HIP_PLATFORM=$(shell $(HIP_PATH)/bin/hipconfig --platform)
-ifeq (${HIP_PLATFORM}, hcc)
-	CXXFLAGS += " -stdlib=libc++"
-endif
 
 CODE_OBJECTS=nullkernel.hsaco
 
diff --git a/samples/1_Utils/hipCommander/hipCommander.cpp b/samples/1_Utils/hipCommander/hipCommander.cpp
index 0add1ce3e3..4b93180b18 100644
--- a/samples/1_Utils/hipCommander/hipCommander.cpp
+++ b/samples/1_Utils/hipCommander/hipCommander.cpp
@@ -11,7 +11,6 @@
 #include <elf.h>
 #include <hsa/hsa.h>
 #include <hc.hpp>
-#include <hip/hcc_detail/hcc_acc.h>
 #endif
 
 #include <sys/time.h>