From 10240493971a771818d65cbf55dcc614282128bd Mon Sep 17 00:00:00 2001 From: "Ding, Wei (xN/A) TX" Date: Fri, 27 Feb 2015 21:00:20 -0500 Subject: [PATCH] ECR #333755 - Fixed miscs errors, clean up repo. [git-p4: depot-paths = "//depot/stg/hsa/drivers/hsa/runtime/": change = 1126044] [ROCm/ROCR-Runtime commit: 2a923d9b7c44b9f1c9a2be4fae3d8d3eaa2c9c25] --- projects/rocr-runtime/samples/build/Makefile | 9 ---- .../samples/build/Makefile.samples | 53 ------------------- 2 files changed, 62 deletions(-) delete mode 100644 projects/rocr-runtime/samples/build/Makefile delete mode 100644 projects/rocr-runtime/samples/build/Makefile.samples diff --git a/projects/rocr-runtime/samples/build/Makefile b/projects/rocr-runtime/samples/build/Makefile deleted file mode 100644 index 639cb73d07..0000000000 --- a/projects/rocr-runtime/samples/build/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -OPENCL_DEPTH = ../../.. - -include $(OPENCL_DEPTH)/hsadefs - -BUILD_SUBDIRS = $(DEFAULT_TARGETS) -BUILD_MAKEFILE = Makefile.samples - - -include $(OPENCL_DEPTH)/hsarules diff --git a/projects/rocr-runtime/samples/build/Makefile.samples b/projects/rocr-runtime/samples/build/Makefile.samples deleted file mode 100644 index 204e549733..0000000000 --- a/projects/rocr-runtime/samples/build/Makefile.samples +++ /dev/null @@ -1,53 +0,0 @@ -include $(OPENCL_DEPTH)/hsadefs - -EXE_TARGET = Test -vpath %.cpp $(COMPONENT_DEPTH) -CPPFILES := $(notdir $(wildcard $(COMPONENT_DEPTH)/*.cpp)) - -ifdef ATI_BITS_64 - LIB_SUFFIX = 64 - NBITS = 64 -else - LIB_SUFFIX = - ifndef ATI_OS_WINDOWS - NBITS := 32 - endif -endif - -ifdef ATI_OS_WINDOWS - CORE_LIB = dll - LFLAGS += /subsystem:console - LIB_PREFIX = -else - CORE_LIB = so - LIB_PREFIX = lib -endif - -ifdef ATI_OS_LINUX - GCXXOPTS := $(filter-out -fno-rtti,$(GCXXOPTS)) - GCXXOPTS := $(filter-out -fno-exceptions,$(GCXXOPTS)) - LFLAGS += -L$(DIST_LIB_DEST) -lpthread $(LIBSTDCXX) -lm -ldl -lrt -endif - -export BUILD_HSA_TARGET=yes - -LCINCS := $(INCSWITCH) "$(OPENCL_DEPTH)/compiler/finalizer/HSAIL/hsail-tools/libHSAIL" -LCINCS += $(INCSWITCH) "$(OPENCL_DEPTH)/compiler/finalizer/HSAIL/hsail-tools/libHSAIL/$(FULL_BUILD_DIR)" -LCINCS += $(INCSWITCH) "$(OPENCL_DEPTH)/compiler/finalizer/Interface" -LCINCS += $(INCSWITCH) "$(OPENCL_DEPTH)/contrib/gtest-1.6.0/include" -LCINCS += $(INCSWITCH) "$(OPENCL_DEPTH)/runtime/inc" - -LLLIBS := $(OPENCL_DEPTH)/contrib/gtest-1.6.0/$(FULL_BUILD_DIR)/libgtest$(LIB_EXT) -LLLIBS += $(OPENCL_DEPTH)/runtime/test/common/$(FULL_BUILD_DIR)/testcommon$(LIB_EXT) -LLLIBS += $(OPENCL_DEPTH)/runtime/test/gcommon/$(FULL_BUILD_DIR)/gtestcommon$(LIB_EXT) -LLLIBS += $(OPENCL_DEPTH)/compiler/finalizer/HSAIL/hsail-tools/libHSAIL/$(FULL_BUILD_DIR)/libhsail$(LIB_EXT) - -RUNTIME_BUILD = build/$(OS_TYPE)/$(CORE_LIB)/$(BUILD_DIR) - -ifdef ATI_OS_LINUX - LFLAGS += -L$(OPENCL_DEPTH)/runtime/core/$(RUNTIME_BUILD) -lhsa-runtime$(LIB_SUFFIX) -else - LLLIBS += $(OPENCL_DEPTH)/runtime/core/$(RUNTIME_BUILD)/hsa-runtime$(LIB_SUFFIX)$(LIB_EXT) -endif - -include $(OPENCL_DEPTH)/hsarules