diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
index fb583733a05..dc54e4fcab3 100644
--- a/src/hotspot/cpu/ppc/ppc.ad
+++ b/src/hotspot/cpu/ppc/ppc.ad
@@ -4085,7 +4085,7 @@ frame %{
// The `sig' array is to be updated. sig[j] represents the location
// of the j-th argument, either a register or a stack slot.
- // Comment taken from i486.ad:
+ // Comment taken from x86_32.ad:
// Body of function which returns an integer array locating
// arguments either in registers or in stack slots. Passed an array
// of ideal registers called "sig" and a "length" count. Stack-slot
@@ -4097,7 +4097,7 @@ frame %{
SharedRuntime::java_calling_convention(sig_bt, regs, length, false);
%}
- // Comment taken from i486.ad:
+ // Comment taken from x86_32.ad:
// Body of function which returns an integer array locating
// arguments either in registers or in stack slots. Passed an array
// of ideal registers called "sig" and a "length" count. Stack-slot
diff --git a/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
index f116a443d85..ab1668f7a75 100644
--- a/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
+++ b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
@@ -633,7 +633,7 @@ JVM_handle_bsd_signal(int sig,
int op = pc[0];
if (op == 0xDB) {
// FIST
- // TODO: The encoding of D2I in i486.ad can cause an exception
+ // TODO: The encoding of D2I in x86_32.ad can cause an exception
// prior to the fist instruction if there was an invalid operation
// pending. We want to dismiss that exception. From the win_32
// side it also seems that if it really was the fist causing
diff --git a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
index c97d918ca5f..cffb1e95a81 100644
--- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
+++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
@@ -463,7 +463,7 @@ JVM_handle_linux_signal(int sig,
int op = pc[0];
if (op == 0xDB) {
// FIST
- // TODO: The encoding of D2I in i486.ad can cause an exception
+ // TODO: The encoding of D2I in x86_32.ad can cause an exception
// prior to the fist instruction if there was an invalid operation
// pending. We want to dismiss that exception. From the win_32
// side it also seems that if it really was the fist causing
diff --git a/src/hotspot/share/adlc/Test/i486.ad b/src/hotspot/share/adlc/Test/i486.ad
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/hotspot/share/adlc/output_c.cpp b/src/hotspot/share/adlc/output_c.cpp
index 38089d9dd18..9d9154eaec1 100644
--- a/src/hotspot/share/adlc/output_c.cpp
+++ b/src/hotspot/share/adlc/output_c.cpp
@@ -3005,7 +3005,7 @@ void ArchDesc::define_oper_interface(FILE *fp, OperandForm &oper, FormDict &glob
// Provide a non-NULL return for disp_as_type() that will allow adr_type()
// to correctly compute the access type for alias analysis.
//
- // See BugId 4796752, operand indOffset32X in i486.ad
+ // See BugId 4796752, operand indOffset32X in x86_32.ad
int idx = rep_var_to_constant_index(disp, oper, globals);
fprintf(fp," virtual const TypePtr *disp_as_type() const { return _c%d; }\n", idx);
}
diff --git a/src/hotspot/share/opto/machnode.cpp b/src/hotspot/share/opto/machnode.cpp
index 737cca80b1f..8d526b15dc2 100644
--- a/src/hotspot/share/opto/machnode.cpp
+++ b/src/hotspot/share/opto/machnode.cpp
@@ -292,7 +292,7 @@ const Node* MachNode::get_base_and_disp(intptr_t &offset, const TypePtr* &adr_ty
}
offset = disp;
- // In i486.ad, indOffset32X uses base==RegI and disp==RegP,
+ // In x86_32.ad, indOffset32X uses base==RegI and disp==RegP,
// this will prevent alias analysis without the following support:
// Lookup the TypePtr used by indOffset32X, a compile-time constant oop,
// Add the offset determined by the "base", or use Type::OffsetBot.
diff --git a/src/hotspot/share/opto/machnode.hpp b/src/hotspot/share/opto/machnode.hpp
index 030907f6a2a..a5232568063 100644
--- a/src/hotspot/share/opto/machnode.hpp
+++ b/src/hotspot/share/opto/machnode.hpp
@@ -150,7 +150,7 @@ class MachOper : public ResourceObj {
virtual int index_position() const; // index edge position, or -1
// Access the TypeKlassPtr of operands with a base==RegI and disp==RegP
- // Only returns non-null value for i486.ad's indOffset32X
+ // Only returns non-null value for x86_32.ad's indOffset32X
virtual const TypePtr *disp_as_type() const { return NULL; }
// Return the label
diff --git a/src/hotspot/share/opto/parse2.cpp b/src/hotspot/share/opto/parse2.cpp
index cf73e92a1d0..8d84b4fb1de 100644
--- a/src/hotspot/share/opto/parse2.cpp
+++ b/src/hotspot/share/opto/parse2.cpp
@@ -2386,7 +2386,7 @@ void Parse::do_one_bytecode() {
if (Matcher::convL2FSupported()) {
a = pop_pair();
b = _gvn.transform( new ConvL2FNode(a));
- // For i486.ad, FILD doesn't restrict precision to 24 or 53 bits.
+ // For x86_32.ad, FILD doesn't restrict precision to 24 or 53 bits.
// Rather than storing the result into an FP register then pushing
// out to memory to round, the machine instruction that implements
// ConvL2D is responsible for rounding.
@@ -2401,7 +2401,7 @@ void Parse::do_one_bytecode() {
case Bytecodes::_l2d:
a = pop_pair();
b = _gvn.transform( new ConvL2DNode(a));
- // For i486.ad, rounding is always necessary (see _l2f above).
+ // For x86_32.ad, rounding is always necessary (see _l2f above).
// c = dprecision_rounding(b);
c = _gvn.transform(b);
push_pair(c);
diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp
index 84cf3720b3a..e7b32723e47 100644
--- a/src/hotspot/share/runtime/synchronizer.cpp
+++ b/src/hotspot/share/runtime/synchronizer.cpp
@@ -54,8 +54,8 @@
// The "core" versions of monitor enter and exit reside in this file.
// The interpreter and compilers contain specialized transliterated
-// variants of the enter-exit fast-path operations. See i486.ad fast_lock(),
-// for instance. If you make changes here, make sure to modify the
+// variants of the enter-exit fast-path operations. See c2_MacroAssembler_x86.cpp
+// fast_lock(...) for instance. If you make changes here, make sure to modify the
// interpreter, and both C1 and C2 fast-path inline locking code emission.
//
// -----------------------------------------------------------------------------