4 files changed, 14 insertions, 14 deletions
diff --git a/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$Node.h b/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$Node.h
index 423f2a06356..0976920620f 100644
--- a/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$Node.h
+++ b/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$Node.h
@@ -22,10 +22,10 @@ public: // actually package-private
   static const jint CONDITION = -2;
   static ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * SHARED;
   static ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * EXCLUSIVE;
-  volatile jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) waitStatus;
-  volatile ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * prev;
-  volatile ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * next;
-  volatile ::java::lang::Thread * thread;
+  jint volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) waitStatus;
+  ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * volatile prev;
+  ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * volatile next;
+  ::java::lang::Thread * volatile thread;
   ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * nextWaiter;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.h b/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.h
index 1e95c3d34b8..41f1f7cba88 100644
--- a/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.h
+++ b/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.h
@@ -97,9 +97,9 @@ public: // actually package-private
   static void access$0();
 private:
   static const jlong serialVersionUID = 7373984972572414692LL;
-  volatile ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::AbstractOwnableSynchronizer)))) head;
-  volatile ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * tail;
-  volatile jlong state;
+  ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * volatile __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::AbstractOwnableSynchronizer)))) head;
+  ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * volatile tail;
+  jlong volatile state;
 public: // actually package-private
   static const jlong spinForTimeoutThreshold = 1000LL;
 private:
diff --git a/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer$Node.h b/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer$Node.h
index 0abbb8fd23a..cc49550577d 100644
--- a/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer$Node.h
+++ b/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer$Node.h
@@ -22,10 +22,10 @@ public: // actually package-private
   static const jint CONDITION = -2;
   static ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * SHARED;
   static ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * EXCLUSIVE;
-  volatile jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) waitStatus;
-  volatile ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * prev;
-  volatile ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * next;
-  volatile ::java::lang::Thread * thread;
+  jint volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) waitStatus;
+  ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * volatile prev;
+  ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * volatile next;
+  ::java::lang::Thread * volatile thread;
   ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * nextWaiter;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer.h b/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer.h
index fc2b9df033d..e50fcef61af 100644
--- a/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer.h
+++ b/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer.h
@@ -97,9 +97,9 @@ public: // actually package-private
   static void access$0();
 private:
   static const jlong serialVersionUID = 7373984972572414691LL;
-  volatile ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::AbstractOwnableSynchronizer)))) head;
-  volatile ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * tail;
-  volatile jint state;
+  ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * volatile __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::AbstractOwnableSynchronizer)))) head;
+  ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * volatile tail;
+  jint volatile state;
 public: // actually package-private
   static const jlong spinForTimeoutThreshold = 1000LL;
 private: