diff --git a/bin/hipcc b/bin/hipcc
index 51cf35fff3..74d794f977 100755
--- a/bin/hipcc
+++ b/bin/hipcc
@@ -740,12 +740,9 @@ if($HIP_PLATFORM eq "hcc"){
         # Ignore 'gfx000' target reported by rocm_agent_enumerator.
         if ($val ne 'gfx000') {
             # Construct an arch macro to be passed to the compiler.
-            # Example: gfx900 --> -D__HIP_ARCH_GFX900__=1
-            my $archMacro = ' -D__HIP_ARCH_' . uc($val) . '__=1 ';
             # Add the arch option and macro to the compiler options.
             $GPU_ARCH_ARG = $GPU_ARCH_OPT . $val;
             $HIPLDARCHFLAGS .= $GPU_ARCH_ARG;
-            $HIPCXXFLAGS .= $archMacro;
             if ($HIP_COMPILER eq 'clang' and $hasHIP) {
                 $HIPCXXFLAGS .= $GPU_ARCH_ARG;
             }
diff --git a/tests/src/deviceLib/hipMathFunctions.cpp b/tests/src/deviceLib/hipMathFunctions.cpp
index cbc608b72b..9f8d5b0618 100644
--- a/tests/src/deviceLib/hipMathFunctions.cpp
+++ b/tests/src/deviceLib/hipMathFunctions.cpp
@@ -29,13 +29,6 @@ THE SOFTWARE.
 #include "hip/hip_runtime.h"
 #include "test_common.h"
 
-#if __HIP_ARCH_GFX803__  || \
-    __HIP_ARCH_GFX900__  || \
-    __HIP_ARCH_GFX906__  || \
-    __HIP_ARCH_GFX908__  || \
-    __HIP_ARCH_GFX1010__ || \
-    __HIP_ARCH_GFX1012__
-
 __global__ void kernel_abs_int64(long long *input, long long *output) {
     int tx = threadIdx.x;
     output[tx] = abs(input[tx]);
@@ -46,8 +39,6 @@ __global__ void kernel_lgamma_double(double *input, double *output) {
     output[tx] = lgamma(input[tx]);
 }
 
-#endif
-
 #define CHECK_LGAMMA_DOUBLE(IN, OUT, EXP)		 \
   {						 \
     if (OUT != EXP)  {				 \
diff --git a/tests/src/deviceLib/hipTestHalf.cpp b/tests/src/deviceLib/hipTestHalf.cpp
index 64a9f7fa63..e3b93f5c84 100644
--- a/tests/src/deviceLib/hipTestHalf.cpp
+++ b/tests/src/deviceLib/hipTestHalf.cpp
@@ -28,13 +28,6 @@ THE SOFTWARE.
 
 #include "test_common.h"
 
-#if __HIP_ARCH_GFX803__  || \
-    __HIP_ARCH_GFX900__  || \
-    __HIP_ARCH_GFX906__  || \
-    __HIP_ARCH_GFX908__  || \
-    __HIP_ARCH_GFX1010__ || \
-    __HIP_ARCH_GFX1012__
-
 __device__ void test_convert() {
   __half x;
   float y = (float)x;
@@ -108,8 +101,6 @@ __global__ void testHalf2Abs(float2* p) {
     *p = __half22float2(a);
 }
 
-#endif
-
 
 __half host_ushort_as_half(unsigned short s) {
   union {__half h; unsigned short s; } converter;
diff --git a/tests/src/deviceLib/hipTestNativeHalf.cpp b/tests/src/deviceLib/hipTestNativeHalf.cpp
index 8639127c7c..9a5345ad7b 100644
--- a/tests/src/deviceLib/hipTestNativeHalf.cpp
+++ b/tests/src/deviceLib/hipTestNativeHalf.cpp
@@ -32,13 +32,6 @@ THE SOFTWARE.
 
 using namespace std;
 
-#if __HIP_ARCH_GFX803__  || \
-    __HIP_ARCH_GFX900__  || \
-    __HIP_ARCH_GFX906__  || \
-    __HIP_ARCH_GFX908__  || \
-    __HIP_ARCH_GFX1010__ || \
-    __HIP_ARCH_GFX1012__
-
 __global__
 void __halfTest(bool* result, __half a) {
     // Construction
@@ -168,8 +161,6 @@ void __half2Test(bool* result, __half2 a) {
     #endif
 }
 
-#endif
-
 int main() {
     bool* result{nullptr};
     hipHostMalloc(&result, 1);