From 9799a0278a4496654714c22663060f570e8c59eb Mon Sep 17 00:00:00 2001
From: agunashe <86270081+agunashe@users.noreply.github.com>
Date: Wed, 12 Jan 2022 20:33:58 -0800
Subject: [PATCH 1/2] SWDEV-296926 - warning message for hipcc/hipconfig pl
 deprecation (#2438)

Change-Id: I9bd339b1cbeac54b9905a00a71849a441694d0ff
---
 bin/hipcc     | 5 +++++
 bin/hipconfig | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/bin/hipcc b/bin/hipcc
index 7b84067202..4b16ee6c91 100755
--- a/bin/hipcc
+++ b/bin/hipcc
@@ -759,6 +759,11 @@ if ($printCXXFlags) {
 if ($printLDFlags) {
     print $HIPLDFLAGS;
 }
+
+$warn = "\nPlease note that hipcc/hipconfig perl binaries are deprecated and will be removed in a future release.
+hipcc/hipconfig as C++ binaries are available for use as hipcc.bin and hipconfig.bin. \n";
+print "$warn";
+
 if ($runCmd) {
     system ("$CMD");
     if ($? == -1) {
diff --git a/bin/hipconfig b/bin/hipconfig
index 5ddb8e9b7d..f6cc60e3f3 100755
--- a/bin/hipconfig
+++ b/bin/hipconfig
@@ -48,6 +48,7 @@ $ROCM_PATH      =   $hipvars::ROCM_PATH;
 $HIP_VERSION    =   $hipvars::HIP_VERSION;
 $HSA_PATH       =   $hipvars::HSA_PATH;
 
+
 Getopt::Long::Configure ( qw{bundling no_ignore_case});
 GetOptions(
      "help|h" => \$p_help
@@ -148,6 +149,9 @@ if ($p_version) {
 }
 
 if (!$printed or $p_full) {
+    $warn = "Please note that hipcc/hipconfig perl binaries are deprecated and will be removed in a future release.
+hipcc/hipconfig as C++ binaries are available for use as hipcc.bin and hipconfig.bin. \n";
+    print "$warn";
     print "HIP version  : ", $HIP_VERSION, "\n\n";
     print "== hipconfig\n";
     print "HIP_PATH     : ", $HIP_PATH, "\n";

From b253a4617b84714f547937b57a5c50a8f50b431a Mon Sep 17 00:00:00 2001
From: TomSang <Tao.Sang@amd.com>
Date: Mon, 24 Jan 2022 00:45:36 -0500
Subject: [PATCH 2/2] SWDEV-319221 - Fix c++/g++ build (#2464)

CentOS 7.5 has too old c++/g++/gcc(<version 5) in /usr/bin.
They cannot support __has_attribute, thus build failure will
happen.
Remove hardcoded /usr/bin path so that the target version will
be selected via PATH. For example in CentOS,
PATH=/opt/rh/devtoolset-7/root/usr/bin:$PATH, c++/g++/gcc will
be from /opt/rh/devtoolset-7/root/usr/bin.

Change-Id: Id77c54127eb0b9960e78897af75cfc3666d85689
---
 tests/hit/HIT.cmake | 4 ++--
 tests/hit/parser    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/hit/HIT.cmake b/tests/hit/HIT.cmake
index f831d5965f..006c9ec999 100755
--- a/tests/hit/HIT.cmake
+++ b/tests/hit/HIT.cmake
@@ -372,8 +372,8 @@ macro(HIT_ADD_FILES _config _dir _label _parent)
         string(REGEX REPLACE "%hc" "${HIP_HIPCC_EXECUTABLE}" _contents "${_contents}")
         string(REGEX REPLACE "%hip-path" "${HIP_ROOT_DIR}" _contents "${_contents}")
         string(REGEX REPLACE "%rocm-path" "${ROCM_PATH}" _contents "${_contents}")
-        string(REGEX REPLACE "%cc" "/usr/bin/cc" _contents "${_contents}")
-        string(REGEX REPLACE "%cxx" "/usr/bin/c++" _contents "${_contents}")
+        string(REGEX REPLACE "%cc" "cc" _contents "${_contents}")
+        string(REGEX REPLACE "%cxx" "c++" _contents "${_contents}")
         string(REGEX REPLACE "%S" ${_dir} _contents "${_contents}")
         string(REGEX REPLACE "%T" ${_label} _contents "${_contents}")
         foreach(_cmd ${_contents})
diff --git a/tests/hit/parser b/tests/hit/parser
index bad5e62311..b493e4f6ec 100755
--- a/tests/hit/parser
+++ b/tests/hit/parser
@@ -67,7 +67,7 @@ sub parse_file {
                 $line =~ s/%s/$file/g;          # Substitute %s -> filename
                 $line =~ s/%t/$exe/g;           # Substitute %t -> targetname
                 # Substitute %hc -> /path/to/hipcc and %hip-path -> /path/to/hip happens in cmake
-                # Substitute %cc -> /usr/bin/cc and %cxx -> /usr/bin/c++ happens in cmake
+                # Substitute %cc -> cc and %cxx -> c++ happens in cmake
                 # Substitute %S -> src dir and %T -> target build dir happens in cmake
                 $line =~ s/\R//g;               # Remove line endings
                 push @customBuildCMDs, $line;