Skip to content

Commit 7737f8b

Browse files
committed
Clean up Common.mk to remove unnecessary HSA defines
Change-Id: I263e3929e9569b0aa5b0adc7d4c4c598e8ba9147
1 parent f75d4de commit 7737f8b

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

Build/Linux/Common.mk

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ CFLAGS = -std=c++11 $(OPTIMIZE) -fPIC -D_LINUX -Wno-write-strings $(PLATFORM_CFL
1313
# ADDLCFLAGS = -Wall -Wno-unknown-pragmas -Wno-strict-aliasing -Wno-non-virtual-dtor -Werror -msse
1414
PLATFORM_DIR = x64
1515
BUILD_DEF = -DGDT_BUILD_SUFFIX=
16-
HSA_PLATFORM_DIR = x86_64
17-
HSA_PLATFORM_SUFFIX = 64
1816
GLES_PLATFORM_DIR=Linx64
1917
MAKEFILENAME=makefile
2018
BASE_OBJDIR = obj
@@ -39,7 +37,6 @@ COMMON_DIR = $(DEPTH)/../Common
3937
COMMON_SRC = $(COMMON_DIR)/Src
4038
ATI_STREAM_SDK_DIR = $(COMMON_DIR)/Lib/AMD/APPSDK/3-0
4139
HSA_DIR = /opt/rocm/hsa
42-
HSA_LIB_DIR = $(HSA_DIR)/lib/$(HSA_PLATFORM_DIR)
4340
DEVICEINFO_DIR = $(COMMON_SRC)/DeviceInfo
4441
DEVICEINFOINTERNAL_DIR = $(COMMON_SRC)/DeviceInfo-Internal
4542
GPUPERFAPIUTILS_DIR = $(COMMON_SRC)/GPUPerfAPIUtils
@@ -62,7 +59,7 @@ COMMON_LIBS = -lGPUPerfAPI-Common$(TARGET_SUFFIX) -lGPUPerfAPICounterGenerator$(
6259
STANDARD_LIBS = -ldl -lpthread
6360

6461
# Build target overrides
65-
X86_OVERRIDES = "PLATFORM_CFLAG = -m32 -msse2" "PLATFORM_LFLAG = -m32" "PLATFORM_DEFINES = -DX86 -DGDT_PLATFORM_SUFFIX=\\\"32\\\"" "CODEXL_OUTPUT_DIR = Output_x86" "PLATFORM_DIR = x86" "HSA_PLATFORM_DIR = x86" "HSA_PLATFORM_SUFFIX =" "HSA_PLATFORM_SUFFIX_COMPILER_LIB = 32" "GLES_PLATFORM_DIR = Linx86"
62+
X86_OVERRIDES = "PLATFORM_CFLAG = -m32 -msse2" "PLATFORM_LFLAG = -m32" "PLATFORM_DEFINES = -DX86 -DGDT_PLATFORM_SUFFIX=\\\"32\\\"" "CODEXL_OUTPUT_DIR = Output_x86" "PLATFORM_DIR = x86" "GLES_PLATFORM_DIR = Linx86"
6663
INTERNAL_OVERRIDES = "BUILD_DEFINES = -DGDT_INTERNAL -DGDT_BUILD_SUFFIX=\\\"-Internal\\\"" "INTERNAL_PUBLIC = _Internal"
6764
DEBUG_OVERRIDES = "OPTIMIZE = $(DEBUG_CFLAGS)" "DEBUG_RELEASE = debug" "DEBUG_DEFINES = -DGDT_DEBUG_SUFFIX=\\\"-d\\\""
6865

0 commit comments

Comments
 (0)