diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index 64abbec54f3..d5ef14d7cc4 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -1132,10 +1132,9 @@ class RelocateBufferToRequested : public BitMapClosure {
   }
 };
 
-#ifdef _LP64
 int ArchiveBuilder::precomputed_narrow_klass_shift() {
-  // Legacy Mode:
-  //    We use 32 bits for narrowKlass, which should cover the full 4G Klass range. Shift can be 0.
+  // Standard Mode:
+  //    We use 32 bits for narrowKlass, which should cover a full 4G Klass range. Shift can be 0.
   // CompactObjectHeader Mode:
   //    narrowKlass is much smaller, and we use the highest possible shift value to later get the maximum
   //    Klass encoding range.
@@ -1144,7 +1143,6 @@ int ArchiveBuilder::precomputed_narrow_klass_shift() {
   // narrow Klass IDs at archive load time.
   return UseCompactObjectHeaders ?  CompressedKlassPointers::max_shift() : 0;
 }
-#endif // _LP64
 
 void ArchiveBuilder::relocate_to_requested() {
   if (!ro_region()->is_packed()) {
diff --git a/src/hotspot/share/cds/archiveBuilder.hpp b/src/hotspot/share/cds/archiveBuilder.hpp
index 9a628439039..981f9a370ea 100644
--- a/src/hotspot/share/cds/archiveBuilder.hpp
+++ b/src/hotspot/share/cds/archiveBuilder.hpp
@@ -511,7 +511,6 @@ public:
   void print_stats();
   void report_out_of_space(const char* name, size_t needed_bytes);
 
-#ifdef _LP64
   // The CDS archive contains pre-computed narrow Klass IDs. It carries them in the headers of
   // archived heap objects. With +UseCompactObjectHeaders, it also carries them in prototypes
   // in Klass.
@@ -531,7 +530,6 @@ public:
   // TinyClassPointer Mode:
   //    We use the highest possible shift value to maximize the encoding range size.
   static int precomputed_narrow_klass_shift();
-#endif // _LP64
 
 };