diff --git a/mozilla/ef/Compiler/RegisterAllocator/Coloring.cpp b/mozilla/ef/Compiler/RegisterAllocator/Coloring.cpp
index 846bf058f61..0b1d9ea5677 100644
--- a/mozilla/ef/Compiler/RegisterAllocator/Coloring.cpp
+++ b/mozilla/ef/Compiler/RegisterAllocator/Coloring.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in
diff --git a/mozilla/ef/Compiler/RegisterAllocator/Coloring.h b/mozilla/ef/Compiler/RegisterAllocator/Coloring.h
index f83b6d535ae..2292e26da69 100644
--- a/mozilla/ef/Compiler/RegisterAllocator/Coloring.h
+++ b/mozilla/ef/Compiler/RegisterAllocator/Coloring.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in
diff --git a/mozilla/ef/Compiler/RegisterAllocator/Liveness.cpp b/mozilla/ef/Compiler/RegisterAllocator/Liveness.cpp
index 70b7c085bbb..b8cba69ebff 100644
--- a/mozilla/ef/Compiler/RegisterAllocator/Liveness.cpp
+++ b/mozilla/ef/Compiler/RegisterAllocator/Liveness.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in
diff --git a/mozilla/ef/Compiler/RegisterAllocator/Liveness.h b/mozilla/ef/Compiler/RegisterAllocator/Liveness.h
index 894214ae5cc..6745da6f687 100644
--- a/mozilla/ef/Compiler/RegisterAllocator/Liveness.h
+++ b/mozilla/ef/Compiler/RegisterAllocator/Liveness.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in
diff --git a/mozilla/ef/Compiler/RegisterAllocator/NewRegisterAllocator.cpp b/mozilla/ef/Compiler/RegisterAllocator/NewRegisterAllocator.cpp
index 9c347f0fa93..524193a9024 100644
--- a/mozilla/ef/Compiler/RegisterAllocator/NewRegisterAllocator.cpp
+++ b/mozilla/ef/Compiler/RegisterAllocator/NewRegisterAllocator.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in
diff --git a/mozilla/ef/Compiler/RegisterAllocator/NewRegisterAllocator.h b/mozilla/ef/Compiler/RegisterAllocator/NewRegisterAllocator.h
index 188bae9f2d6..bc9a75a23a8 100644
--- a/mozilla/ef/Compiler/RegisterAllocator/NewRegisterAllocator.h
+++ b/mozilla/ef/Compiler/RegisterAllocator/NewRegisterAllocator.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in
diff --git a/mozilla/ef/Compiler/RegisterAllocator/NewVirtualRegister.cpp b/mozilla/ef/Compiler/RegisterAllocator/NewVirtualRegister.cpp
index a08eeb237d3..f37698fc2d8 100644
--- a/mozilla/ef/Compiler/RegisterAllocator/NewVirtualRegister.cpp
+++ b/mozilla/ef/Compiler/RegisterAllocator/NewVirtualRegister.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in
diff --git a/mozilla/ef/Compiler/RegisterAllocator/NewVirtualRegister.h b/mozilla/ef/Compiler/RegisterAllocator/NewVirtualRegister.h
index 094ca580b29..5b3f8c72449 100644
--- a/mozilla/ef/Compiler/RegisterAllocator/NewVirtualRegister.h
+++ b/mozilla/ef/Compiler/RegisterAllocator/NewVirtualRegister.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in
diff --git a/mozilla/ef/Compiler/RegisterAllocator/RegisterAllocator.cpp b/mozilla/ef/Compiler/RegisterAllocator/RegisterAllocator.cpp
index 8f78dfec951..b7196422d4b 100644
--- a/mozilla/ef/Compiler/RegisterAllocator/RegisterAllocator.cpp
+++ b/mozilla/ef/Compiler/RegisterAllocator/RegisterAllocator.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in
diff --git a/mozilla/ef/Compiler/RegisterAllocator/RegisterAllocator.h b/mozilla/ef/Compiler/RegisterAllocator/RegisterAllocator.h
index be73f37874e..e2abdbb02d1 100644
--- a/mozilla/ef/Compiler/RegisterAllocator/RegisterAllocator.h
+++ b/mozilla/ef/Compiler/RegisterAllocator/RegisterAllocator.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in
diff --git a/mozilla/ef/Compiler/RegisterAllocator/RegisterAssigner.h b/mozilla/ef/Compiler/RegisterAllocator/RegisterAssigner.h
index c2051b72272..125b0cd49cc 100644
--- a/mozilla/ef/Compiler/RegisterAllocator/RegisterAssigner.h
+++ b/mozilla/ef/Compiler/RegisterAllocator/RegisterAssigner.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in
diff --git a/mozilla/ef/Compiler/RegisterAllocator/SSATools.cpp b/mozilla/ef/Compiler/RegisterAllocator/SSATools.cpp
index 7a7252697a5..cd74bb8051b 100644
--- a/mozilla/ef/Compiler/RegisterAllocator/SSATools.cpp
+++ b/mozilla/ef/Compiler/RegisterAllocator/SSATools.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in
diff --git a/mozilla/ef/Compiler/RegisterAllocator/SSATools.h b/mozilla/ef/Compiler/RegisterAllocator/SSATools.h
index bc5717e08b4..fc0600d4607 100644
--- a/mozilla/ef/Compiler/RegisterAllocator/SSATools.h
+++ b/mozilla/ef/Compiler/RegisterAllocator/SSATools.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in
diff --git a/mozilla/ef/Compiler/RegisterAllocator/Spilling.cpp b/mozilla/ef/Compiler/RegisterAllocator/Spilling.cpp
index 015e33d170f..27df689a792 100644
--- a/mozilla/ef/Compiler/RegisterAllocator/Spilling.cpp
+++ b/mozilla/ef/Compiler/RegisterAllocator/Spilling.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in
diff --git a/mozilla/ef/Compiler/RegisterAllocator/Spilling.h b/mozilla/ef/Compiler/RegisterAllocator/Spilling.h
index bde09a0fd41..929069d6966 100644
--- a/mozilla/ef/Compiler/RegisterAllocator/Spilling.h
+++ b/mozilla/ef/Compiler/RegisterAllocator/Spilling.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in
diff --git a/mozilla/ef/Compiler/RegisterAllocator/Timer.cpp b/mozilla/ef/Compiler/RegisterAllocator/Timer.cpp
index 35e210c5982..aae675cf4f5 100644
--- a/mozilla/ef/Compiler/RegisterAllocator/Timer.cpp
+++ b/mozilla/ef/Compiler/RegisterAllocator/Timer.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in
diff --git a/mozilla/ef/Compiler/RegisterAllocator/Timer.h b/mozilla/ef/Compiler/RegisterAllocator/Timer.h
index 30fbdae66d4..23e0bad45cf 100644
--- a/mozilla/ef/Compiler/RegisterAllocator/Timer.h
+++ b/mozilla/ef/Compiler/RegisterAllocator/Timer.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in
diff --git a/mozilla/ef/Compiler/RegisterAllocator/VirtualRegister.cpp b/mozilla/ef/Compiler/RegisterAllocator/VirtualRegister.cpp
index a39fab8338c..2e333ba8427 100644
--- a/mozilla/ef/Compiler/RegisterAllocator/VirtualRegister.cpp
+++ b/mozilla/ef/Compiler/RegisterAllocator/VirtualRegister.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in
diff --git a/mozilla/ef/Compiler/RegisterAllocator/VirtualRegister.h b/mozilla/ef/Compiler/RegisterAllocator/VirtualRegister.h
index 39f3c010387..8b3c602e50b 100644
--- a/mozilla/ef/Compiler/RegisterAllocator/VirtualRegister.h
+++ b/mozilla/ef/Compiler/RegisterAllocator/VirtualRegister.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in