Revert "LLVM Target Reorg - Changes"

Author: arvindcheru

script/build_kernel.sh

@@ -32,8 +32,8 @@ fi
 
 OCL_VER="2.0"
 
-if [ -e $ROCM_DIR/bin/llvm ] ; then
-  LLVM_DIR=$ROCM_DIR
+if [ -e $ROCM_DIR/llvm ] ; then
+  LLVM_DIR=$ROCM_DIR/llvm
   LIB_DIR=$ROCM_DIR/lib
 else
   LLVM_DIR=$ROCM_DIR/hcc
@@ -73,7 +73,7 @@ fi
 for GFXIP in $TGT_LIST ; do
   OBJ_PREF=$GFXIP
   OBJ_FILE="${OBJ_PREF}_${OBJ_NAME}.$SO_EXT"
-  $BIN_DIR/llvm/clang -cl-std=CL$OCL_VER -include $INC_DIR/opencl-c.h $BITCODE_OPTS -target amdgcn-amd-amdhsa -mcpu=$GFXIP $TEST_NAME.cl -o $DST_DIR/$OBJ_FILE
+  $BIN_DIR/clang -cl-std=CL$OCL_VER -include $INC_DIR/opencl-c.h $BITCODE_OPTS -target amdgcn-amd-amdhsa -mcpu=$GFXIP $TEST_NAME.cl -o $DST_DIR/$OBJ_FILE
   echo "'$OBJ_FILE' generated"
 done