diff --git a/openmp/libomptarget/deviceRTLs/common/device_environment.h b/openmp/libomptarget/deviceRTLs/common/device_environment.h
--- a/openmp/libomptarget/deviceRTLs/common/device_environment.h
+++ b/openmp/libomptarget/deviceRTLs/common/device_environment.h
@@ -17,6 +17,7 @@
 
 struct omptarget_device_environmentTy {
   int32_t debug_level;
+  int32_t device_num;
 };
 
 extern DEVICE omptarget_device_environmentTy omptarget_device_environment;
diff --git a/openmp/libomptarget/deviceRTLs/common/src/libcall.cu b/openmp/libomptarget/deviceRTLs/common/src/libcall.cu
--- a/openmp/libomptarget/deviceRTLs/common/src/libcall.cu
+++ b/openmp/libomptarget/deviceRTLs/common/src/libcall.cu
@@ -11,6 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "common/device_environment.h"
 #include "common/omptarget.h"
 #include "common/target_atomic.h"
 #include "target_impl.h"
@@ -299,6 +300,12 @@
   return 0;
 }
 
+EXTERN int omp_get_device_num(void) {
+  int32_t num = omptarget_device_environment.device_num;
+  PRINT(LD_IO, "call omp_get_device_num() returns %d\n", num);
+  return num;
+}
+
 EXTERN int omp_get_num_devices(void) {
   PRINT0(LD_IO, "call omp_get_num_devices() is undef on device, returns 0\n");
   return 0;
diff --git a/openmp/libomptarget/deviceRTLs/interface.h b/openmp/libomptarget/deviceRTLs/interface.h
--- a/openmp/libomptarget/deviceRTLs/interface.h
+++ b/openmp/libomptarget/deviceRTLs/interface.h
@@ -86,6 +86,7 @@
 EXTERN int omp_get_cancellation(void);
 EXTERN void omp_set_default_device(int deviceId);
 EXTERN int omp_get_default_device(void);
+EXTERN int omp_get_device_num(void);
 EXTERN int omp_get_num_devices(void);
 EXTERN int omp_get_num_teams(void);
 EXTERN int omp_get_team_num(void);
diff --git a/openmp/libomptarget/plugins/amdgpu/src/rtl.cpp b/openmp/libomptarget/plugins/amdgpu/src/rtl.cpp
--- a/openmp/libomptarget/plugins/amdgpu/src/rtl.cpp
+++ b/openmp/libomptarget/plugins/amdgpu/src/rtl.cpp
@@ -527,12 +527,12 @@
 
 pthread_mutex_t SignalPoolT::mutex = PTHREAD_MUTEX_INITIALIZER;
 
-// TODO: May need to drop the trailing to fields until deviceRTL is updated
+/// Device environment data
+/// Manually sync with the deviceRTL side for now, move to a dedicated header
+/// file later.
 struct omptarget_device_environmentTy {
-  int32_t debug_level; // gets value of envvar LIBOMPTARGET_DEVICE_RTL_DEBUG
-                       // only useful for Debug build of deviceRTLs
-  int32_t num_devices; // gets number of active offload devices
-  int32_t device_num;  // gets a value 0 to num_devices-1
+  int32_t debug_level;
+  int32_t device_num;
 };
 
 static RTLDeviceInfoTy DeviceInfo;
@@ -941,7 +941,6 @@
   }
 
   omptarget_device_environmentTy host_device_env;
-  host_device_env.num_devices = DeviceInfo.NumberOfDevices;
   host_device_env.device_num = device_id;
   host_device_env.debug_level = 0;
 #ifdef OMPTARGET_DEBUG
diff --git a/openmp/libomptarget/plugins/cuda/src/rtl.cpp b/openmp/libomptarget/plugins/cuda/src/rtl.cpp
--- a/openmp/libomptarget/plugins/cuda/src/rtl.cpp
+++ b/openmp/libomptarget/plugins/cuda/src/rtl.cpp
@@ -83,6 +83,7 @@
 /// file later.
 struct omptarget_device_environmentTy {
   int32_t debug_level;
+  int32_t device_num;
 };
 
 namespace {
@@ -684,6 +685,7 @@
       if (const char *EnvStr = getenv("LIBOMPTARGET_DEVICE_RTL_DEBUG"))
         DeviceEnv.debug_level = std::stoi(EnvStr);
 #endif
+      DeviceEnv.device_num = DeviceId;
 
       const char *DeviceEnvName = "omptarget_device_environment";
       CUdeviceptr DeviceEnvPtr;