From 3cf0c3c57ebaf07ec2c49a6b438956d03bac3f71 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@gcc.gnu.org>
Date: Mon, 5 Mar 2007 14:29:47 +0000
Subject: Updating header files.  Earlier change here seems to have been in
 error.

From-SVN: r122550
---
 libjava/java/lang/SecurityManager.h                      |  2 +-
 libjava/java/lang/Thread.h                               |  2 +-
 libjava/java/security/VMSecureRandom$Spinner.h           |  4 ++--
 .../java/util/concurrent/ConcurrentHashMap$HashEntry.h   |  2 +-
 libjava/java/util/concurrent/ConcurrentHashMap$Segment.h |  4 ++--
 .../java/util/concurrent/ConcurrentLinkedQueue$Node.h    |  4 ++--
 libjava/java/util/concurrent/ConcurrentLinkedQueue.h     |  4 ++--
 .../java/util/concurrent/ConcurrentSkipListMap$Index.h   |  2 +-
 .../java/util/concurrent/ConcurrentSkipListMap$Node.h    |  4 ++--
 libjava/java/util/concurrent/ConcurrentSkipListMap.h     |  2 +-
 libjava/java/util/concurrent/Exchanger$Node.h            |  2 +-
 libjava/java/util/concurrent/Exchanger.h                 |  2 +-
 libjava/java/util/concurrent/FutureTask$Sync.h           |  2 +-
 libjava/java/util/concurrent/LinkedBlockingQueue$Node.h  |  2 +-
 .../java/util/concurrent/ScheduledThreadPoolExecutor.h   |  4 ++--
 .../concurrent/SynchronousQueue$TransferQueue$QNode.h    |  6 +++---
 .../util/concurrent/SynchronousQueue$TransferQueue.h     |  6 +++---
 .../concurrent/SynchronousQueue$TransferStack$SNode.h    |  6 +++---
 .../util/concurrent/SynchronousQueue$TransferStack.h     |  2 +-
 libjava/java/util/concurrent/SynchronousQueue.h          |  2 +-
 libjava/java/util/concurrent/ThreadPoolExecutor$Worker.h |  2 +-
 libjava/java/util/concurrent/ThreadPoolExecutor.h        | 16 ++++++++--------
 libjava/java/util/concurrent/atomic/AtomicBoolean.h      |  2 +-
 libjava/java/util/concurrent/atomic/AtomicInteger.h      |  2 +-
 libjava/java/util/concurrent/atomic/AtomicLong.h         |  2 +-
 libjava/java/util/concurrent/atomic/AtomicReference.h    |  2 +-
 .../locks/AbstractQueuedLongSynchronizer$Node.h          |  8 ++++----
 .../concurrent/locks/AbstractQueuedLongSynchronizer.h    |  6 +++---
 .../concurrent/locks/AbstractQueuedSynchronizer$Node.h   |  8 ++++----
 .../util/concurrent/locks/AbstractQueuedSynchronizer.h   |  6 +++---
 libjava/java/util/logging/ErrorManager.h                 |  2 +-
 31 files changed, 60 insertions(+), 60 deletions(-)

(limited to 'libjava/java')

diff --git a/libjava/java/lang/SecurityManager.h b/libjava/java/lang/SecurityManager.h
index 28ef484..8abaa6a 100644
--- a/libjava/java/lang/SecurityManager.h
+++ b/libjava/java/lang/SecurityManager.h
@@ -74,7 +74,7 @@ public:
   virtual ::java::lang::ThreadGroup * getThreadGroup();
 public: // actually package-private
   virtual void checkPackageList(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  static volatile ::java::lang::SecurityManager * current;
+  static ::java::lang::SecurityManager * volatile current;
 public: // actually protected
   jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) inCheck;
 public:
diff --git a/libjava/java/lang/Thread.h b/libjava/java/lang/Thread.h
index e9cf921..b9116b1 100644
--- a/libjava/java/lang/Thread.h
+++ b/libjava/java/lang/Thread.h
@@ -147,7 +147,7 @@ public: // actually package-private
   ::java::lang::Object * accessControlState;
   ::gnu::gcj::RawData * interp_frame;
   ::gnu::gcj::RawData * frame;
-  volatile jint state;
+  jint volatile state;
   ::gnu::gcj::RawDataManaged * data;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/java/security/VMSecureRandom$Spinner.h b/libjava/java/security/VMSecureRandom$Spinner.h
index 32a1e31..0013a3f 100644
--- a/libjava/java/security/VMSecureRandom$Spinner.h
+++ b/libjava/java/security/VMSecureRandom$Spinner.h
@@ -29,8 +29,8 @@ private:
   void stop();
 public: // actually package-private
   static void access$0(::java::security::VMSecureRandom$Spinner *);
-  volatile jbyte __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  volatile jboolean running;
+  jbyte volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
+  jboolean volatile running;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/java/util/concurrent/ConcurrentHashMap$HashEntry.h b/libjava/java/util/concurrent/ConcurrentHashMap$HashEntry.h
index 730394d..2667ed0 100644
--- a/libjava/java/util/concurrent/ConcurrentHashMap$HashEntry.h
+++ b/libjava/java/util/concurrent/ConcurrentHashMap$HashEntry.h
@@ -18,7 +18,7 @@ public: // actually package-private
   static JArray< ::java::util::concurrent::ConcurrentHashMap$HashEntry * > * newArray(jint);
   ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
   jint hash;
-  volatile ::java::lang::Object * value;
+  ::java::lang::Object * volatile value;
   ::java::util::concurrent::ConcurrentHashMap$HashEntry * next;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/java/util/concurrent/ConcurrentHashMap$Segment.h b/libjava/java/util/concurrent/ConcurrentHashMap$Segment.h
index aaa2a7a..55d06e8 100644
--- a/libjava/java/util/concurrent/ConcurrentHashMap$Segment.h
+++ b/libjava/java/util/concurrent/ConcurrentHashMap$Segment.h
@@ -31,10 +31,10 @@ public: // actually package-private
 private:
   static const jlong serialVersionUID = 2249069246763182397LL;
 public: // actually package-private
-  volatile jint __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::ReentrantLock)))) count;
+  jint volatile __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::ReentrantLock)))) count;
   jint modCount;
   jint threshold;
-  volatile JArray< ::java::util::concurrent::ConcurrentHashMap$HashEntry * > * table;
+  JArray< ::java::util::concurrent::ConcurrentHashMap$HashEntry * > * volatile table;
   jfloat loadFactor;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/java/util/concurrent/ConcurrentLinkedQueue$Node.h b/libjava/java/util/concurrent/ConcurrentLinkedQueue$Node.h
index 60fee41..af69ba6 100644
--- a/libjava/java/util/concurrent/ConcurrentLinkedQueue$Node.h
+++ b/libjava/java/util/concurrent/ConcurrentLinkedQueue$Node.h
@@ -21,8 +21,8 @@ public: // actually package-private
   virtual jboolean casNext(::java::util::concurrent::ConcurrentLinkedQueue$Node *, ::java::util::concurrent::ConcurrentLinkedQueue$Node *);
   virtual void setNext(::java::util::concurrent::ConcurrentLinkedQueue$Node *);
 private:
-  volatile ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) item;
-  volatile ::java::util::concurrent::ConcurrentLinkedQueue$Node * next;
+  ::java::lang::Object * volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) item;
+  ::java::util::concurrent::ConcurrentLinkedQueue$Node * volatile next;
   static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * nextUpdater;
   static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * itemUpdater;
 public:
diff --git a/libjava/java/util/concurrent/ConcurrentLinkedQueue.h b/libjava/java/util/concurrent/ConcurrentLinkedQueue.h
index 281690e..512bc0e 100644
--- a/libjava/java/util/concurrent/ConcurrentLinkedQueue.h
+++ b/libjava/java/util/concurrent/ConcurrentLinkedQueue.h
@@ -34,8 +34,8 @@ private:
   static const jlong serialVersionUID = 196745693267521676LL;
   static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * tailUpdater;
   static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * headUpdater;
-  volatile ::java::util::concurrent::ConcurrentLinkedQueue$Node * __attribute__((aligned(__alignof__( ::java::util::AbstractQueue)))) head;
-  volatile ::java::util::concurrent::ConcurrentLinkedQueue$Node * tail;
+  ::java::util::concurrent::ConcurrentLinkedQueue$Node * volatile __attribute__((aligned(__alignof__( ::java::util::AbstractQueue)))) head;
+  ::java::util::concurrent::ConcurrentLinkedQueue$Node * volatile tail;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$Index.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$Index.h
index c71b25b..629cff8 100644
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$Index.h
+++ b/libjava/java/util/concurrent/ConcurrentSkipListMap$Index.h
@@ -19,7 +19,7 @@ public: // actually package-private
   virtual jboolean unlink(::java::util::concurrent::ConcurrentSkipListMap$Index *);
   ::java::util::concurrent::ConcurrentSkipListMap$Node * __attribute__((aligned(__alignof__( ::java::lang::Object)))) node;
   ::java::util::concurrent::ConcurrentSkipListMap$Index * down;
-  volatile ::java::util::concurrent::ConcurrentSkipListMap$Index * right;
+  ::java::util::concurrent::ConcurrentSkipListMap$Index * volatile right;
   static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * rightUpdater;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$Node.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$Node.h
index 1b94c35..c9d5d89 100644
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$Node.h
+++ b/libjava/java/util/concurrent/ConcurrentSkipListMap$Node.h
@@ -23,8 +23,8 @@ public: // actually package-private
   ::java::lang::Object * getValidValue();
   ::java::util::AbstractMap$SimpleImmutableEntry * createSnapshot();
   ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  volatile ::java::lang::Object * value;
-  volatile ::java::util::concurrent::ConcurrentSkipListMap$Node * next;
+  ::java::lang::Object * volatile value;
+  ::java::util::concurrent::ConcurrentSkipListMap$Node * volatile next;
   static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * nextUpdater;
   static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * valueUpdater;
 public:
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap.h b/libjava/java/util/concurrent/ConcurrentSkipListMap.h
index 4d42f54..be9beb8 100644
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap.h
+++ b/libjava/java/util/concurrent/ConcurrentSkipListMap.h
@@ -118,7 +118,7 @@ private:
   static const jlong serialVersionUID = -8627078645895051609LL;
   static ::java::util::Random * seedGenerator;
   static ::java::lang::Object * BASE_HEADER;
-  volatile ::java::util::concurrent::ConcurrentSkipListMap$HeadIndex * __attribute__((aligned(__alignof__( ::java::util::AbstractMap)))) head;
+  ::java::util::concurrent::ConcurrentSkipListMap$HeadIndex * volatile __attribute__((aligned(__alignof__( ::java::util::AbstractMap)))) head;
   ::java::util::Comparator * comparator__;
   jint randomSeed;
   ::java::util::concurrent::ConcurrentSkipListMap$KeySet * keySet__;
diff --git a/libjava/java/util/concurrent/Exchanger$Node.h b/libjava/java/util/concurrent/Exchanger$Node.h
index 5e1087b..4bd3890 100644
--- a/libjava/java/util/concurrent/Exchanger$Node.h
+++ b/libjava/java/util/concurrent/Exchanger$Node.h
@@ -14,7 +14,7 @@ class java::util::concurrent::Exchanger$Node : public ::java::util::concurrent::
 public:
   Exchanger$Node(::java::lang::Object *);
   ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::util::concurrent::atomic::AtomicReference)))) item;
-  volatile ::java::lang::Thread * waiter;
+  ::java::lang::Thread * volatile waiter;
   static ::java::lang::Class class$;
 };
 
diff --git a/libjava/java/util/concurrent/Exchanger.h b/libjava/java/util/concurrent/Exchanger.h
index 5ed4d25..5a0993e 100644
--- a/libjava/java/util/concurrent/Exchanger.h
+++ b/libjava/java/util/concurrent/Exchanger.h
@@ -33,7 +33,7 @@ private:
   static jint TIMED_SPINS;
   static ::java::lang::Object * CANCEL;
   static ::java::lang::Object * NULL_ITEM;
-  volatile JArray< ::java::util::concurrent::Exchanger$Slot * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) arena;
+  JArray< ::java::util::concurrent::Exchanger$Slot * > * volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) arena;
   ::java::util::concurrent::atomic::AtomicInteger * max;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/java/util/concurrent/FutureTask$Sync.h b/libjava/java/util/concurrent/FutureTask$Sync.h
index 1880869..edaa1ca 100644
--- a/libjava/java/util/concurrent/FutureTask$Sync.h
+++ b/libjava/java/util/concurrent/FutureTask$Sync.h
@@ -36,7 +36,7 @@ private:
   ::java::util::concurrent::Callable * __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::AbstractQueuedSynchronizer)))) callable;
   ::java::lang::Object * result;
   ::java::lang::Throwable * exception;
-  volatile ::java::lang::Thread * runner;
+  ::java::lang::Thread * volatile runner;
 public: // actually package-private
   ::java::util::concurrent::FutureTask * this$0;
 public:
diff --git a/libjava/java/util/concurrent/LinkedBlockingQueue$Node.h b/libjava/java/util/concurrent/LinkedBlockingQueue$Node.h
index 36d1f65..1cf8cda 100644
--- a/libjava/java/util/concurrent/LinkedBlockingQueue$Node.h
+++ b/libjava/java/util/concurrent/LinkedBlockingQueue$Node.h
@@ -13,7 +13,7 @@ class java::util::concurrent::LinkedBlockingQueue$Node : public ::java::lang::Ob
 
 public: // actually package-private
   LinkedBlockingQueue$Node(::java::lang::Object *);
-  volatile ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) item;
+  ::java::lang::Object * volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) item;
   ::java::util::concurrent::LinkedBlockingQueue$Node * next;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor.h b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor.h
index e01b420..8e651b3 100644
--- a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor.h
+++ b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor.h
@@ -45,8 +45,8 @@ public: // actually package-private
   static ::java::util::concurrent::atomic::AtomicLong * access$0();
   static ::java::util::concurrent::BlockingQueue * access$1(::java::util::concurrent::ScheduledThreadPoolExecutor *);
 private:
-  volatile jboolean __attribute__((aligned(__alignof__( ::java::util::concurrent::ThreadPoolExecutor)))) continueExistingPeriodicTasksAfterShutdown;
-  volatile jboolean executeExistingDelayedTasksAfterShutdown;
+  jboolean volatile __attribute__((aligned(__alignof__( ::java::util::concurrent::ThreadPoolExecutor)))) continueExistingPeriodicTasksAfterShutdown;
+  jboolean volatile executeExistingDelayedTasksAfterShutdown;
   static ::java::util::concurrent::atomic::AtomicLong * sequencer;
   static jlong NANO_ORIGIN;
 public:
diff --git a/libjava/java/util/concurrent/SynchronousQueue$TransferQueue$QNode.h b/libjava/java/util/concurrent/SynchronousQueue$TransferQueue$QNode.h
index 07486a9..105c64e 100644
--- a/libjava/java/util/concurrent/SynchronousQueue$TransferQueue$QNode.h
+++ b/libjava/java/util/concurrent/SynchronousQueue$TransferQueue$QNode.h
@@ -18,9 +18,9 @@ public: // actually package-private
   void tryCancel(::java::lang::Object *);
   jboolean isCancelled();
   jboolean isOffList();
-  volatile ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) next;
-  volatile ::java::lang::Object * item;
-  volatile ::java::lang::Thread * waiter;
+  ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) next;
+  ::java::lang::Object * volatile item;
+  ::java::lang::Thread * volatile waiter;
   jboolean isData;
   static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * nextUpdater;
   static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * itemUpdater;
diff --git a/libjava/java/util/concurrent/SynchronousQueue$TransferQueue.h b/libjava/java/util/concurrent/SynchronousQueue$TransferQueue.h
index d1b55c9..921c363 100644
--- a/libjava/java/util/concurrent/SynchronousQueue$TransferQueue.h
+++ b/libjava/java/util/concurrent/SynchronousQueue$TransferQueue.h
@@ -19,9 +19,9 @@ public: // actually package-private
   ::java::lang::Object * transfer(::java::lang::Object *, jboolean, jlong);
   ::java::lang::Object * awaitFulfill(::java::util::concurrent::SynchronousQueue$TransferQueue$QNode *, ::java::lang::Object *, jboolean, jlong);
   void clean(::java::util::concurrent::SynchronousQueue$TransferQueue$QNode *, ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode *);
-  volatile ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * __attribute__((aligned(__alignof__( ::java::util::concurrent::SynchronousQueue$Transferer)))) head;
-  volatile ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * tail;
-  volatile ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * cleanMe;
+  ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * volatile __attribute__((aligned(__alignof__( ::java::util::concurrent::SynchronousQueue$Transferer)))) head;
+  ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * volatile tail;
+  ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * volatile cleanMe;
   static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * headUpdater;
   static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * tailUpdater;
   static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * cleanMeUpdater;
diff --git a/libjava/java/util/concurrent/SynchronousQueue$TransferStack$SNode.h b/libjava/java/util/concurrent/SynchronousQueue$TransferStack$SNode.h
index 77af8cb..48e22f2 100644
--- a/libjava/java/util/concurrent/SynchronousQueue$TransferStack$SNode.h
+++ b/libjava/java/util/concurrent/SynchronousQueue$TransferStack$SNode.h
@@ -17,9 +17,9 @@ public: // actually package-private
   jboolean tryMatch(::java::util::concurrent::SynchronousQueue$TransferStack$SNode *);
   void tryCancel();
   jboolean isCancelled();
-  volatile ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) next;
-  volatile ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * match;
-  volatile ::java::lang::Thread * waiter;
+  ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) next;
+  ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * volatile match;
+  ::java::lang::Thread * volatile waiter;
   ::java::lang::Object * item;
   jint mode;
   static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * nextUpdater;
diff --git a/libjava/java/util/concurrent/SynchronousQueue$TransferStack.h b/libjava/java/util/concurrent/SynchronousQueue$TransferStack.h
index b29138f..5722c41 100644
--- a/libjava/java/util/concurrent/SynchronousQueue$TransferStack.h
+++ b/libjava/java/util/concurrent/SynchronousQueue$TransferStack.h
@@ -23,7 +23,7 @@ public: // actually package-private
   static const jint REQUEST = 0;
   static const jint DATA = 1;
   static const jint FULFILLING = 2;
-  volatile ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * __attribute__((aligned(__alignof__( ::java::util::concurrent::SynchronousQueue$Transferer)))) head;
+  ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * volatile __attribute__((aligned(__alignof__( ::java::util::concurrent::SynchronousQueue$Transferer)))) head;
   static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * headUpdater;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/java/util/concurrent/SynchronousQueue.h b/libjava/java/util/concurrent/SynchronousQueue.h
index 82ecce4..7606ddc 100644
--- a/libjava/java/util/concurrent/SynchronousQueue.h
+++ b/libjava/java/util/concurrent/SynchronousQueue.h
@@ -47,7 +47,7 @@ public: // actually package-private
   static jint maxUntimedSpins;
   static const jlong spinForTimeoutThreshold = 1000LL;
 private:
-  volatile ::java::util::concurrent::SynchronousQueue$Transferer * __attribute__((aligned(__alignof__( ::java::util::AbstractQueue)))) transferer;
+  ::java::util::concurrent::SynchronousQueue$Transferer * volatile __attribute__((aligned(__alignof__( ::java::util::AbstractQueue)))) transferer;
   ::java::util::concurrent::locks::ReentrantLock * qlock;
   ::java::util::concurrent::SynchronousQueue$WaitQueue * waitingProducers;
   ::java::util::concurrent::SynchronousQueue$WaitQueue * waitingConsumers;
diff --git a/libjava/java/util/concurrent/ThreadPoolExecutor$Worker.h b/libjava/java/util/concurrent/ThreadPoolExecutor$Worker.h
index 18d3f32..a1b5dc3 100644
--- a/libjava/java/util/concurrent/ThreadPoolExecutor$Worker.h
+++ b/libjava/java/util/concurrent/ThreadPoolExecutor$Worker.h
@@ -24,7 +24,7 @@ private:
   ::java::util::concurrent::locks::ReentrantLock * __attribute__((aligned(__alignof__( ::java::lang::Object)))) runLock;
   ::java::lang::Runnable * firstTask;
 public: // actually package-private
-  volatile jlong completedTasks;
+  jlong volatile completedTasks;
   ::java::lang::Thread * thread;
   ::java::util::concurrent::ThreadPoolExecutor * this$0;
 public:
diff --git a/libjava/java/util/concurrent/ThreadPoolExecutor.h b/libjava/java/util/concurrent/ThreadPoolExecutor.h
index 00b9dde..b69b1f6 100644
--- a/libjava/java/util/concurrent/ThreadPoolExecutor.h
+++ b/libjava/java/util/concurrent/ThreadPoolExecutor.h
@@ -71,20 +71,20 @@ private:
   ::java::util::concurrent::locks::ReentrantLock * mainLock;
   ::java::util::concurrent::locks::Condition * termination;
   ::java::util::HashSet * workers;
-  volatile jlong keepAliveTime;
-  volatile jboolean allowCoreThreadTimeOut__;
-  volatile jint corePoolSize;
-  volatile jint maximumPoolSize;
-  volatile jint poolSize;
+  jlong volatile keepAliveTime;
+  jboolean volatile allowCoreThreadTimeOut__;
+  jint volatile corePoolSize;
+  jint volatile maximumPoolSize;
+  jint volatile poolSize;
 public: // actually package-private
-  volatile jint runState;
+  jint volatile runState;
   static const jint RUNNING = 0;
   static const jint SHUTDOWN = 1;
   static const jint STOP = 2;
   static const jint TERMINATED = 3;
 private:
-  volatile ::java::util::concurrent::RejectedExecutionHandler * handler;
-  volatile ::java::util::concurrent::ThreadFactory * threadFactory;
+  ::java::util::concurrent::RejectedExecutionHandler * volatile handler;
+  ::java::util::concurrent::ThreadFactory * volatile threadFactory;
   jint largestPoolSize;
   jlong completedTaskCount;
   static ::java::util::concurrent::RejectedExecutionHandler * defaultHandler;
diff --git a/libjava/java/util/concurrent/atomic/AtomicBoolean.h b/libjava/java/util/concurrent/atomic/AtomicBoolean.h
index 08a6d59..60d22a9 100644
--- a/libjava/java/util/concurrent/atomic/AtomicBoolean.h
+++ b/libjava/java/util/concurrent/atomic/AtomicBoolean.h
@@ -35,7 +35,7 @@ private:
   static const jlong serialVersionUID = 4654671469794556979LL;
   static ::sun::misc::Unsafe * unsafe;
   static jlong valueOffset;
-  volatile jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
+  jint volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/java/util/concurrent/atomic/AtomicInteger.h b/libjava/java/util/concurrent/atomic/AtomicInteger.h
index 286aff1..136a578 100644
--- a/libjava/java/util/concurrent/atomic/AtomicInteger.h
+++ b/libjava/java/util/concurrent/atomic/AtomicInteger.h
@@ -45,7 +45,7 @@ private:
   static const jlong serialVersionUID = 6214790243416807050LL;
   static ::sun::misc::Unsafe * unsafe;
   static jlong valueOffset;
-  volatile jint __attribute__((aligned(__alignof__( ::java::lang::Number)))) value;
+  jint volatile __attribute__((aligned(__alignof__( ::java::lang::Number)))) value;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/java/util/concurrent/atomic/AtomicLong.h b/libjava/java/util/concurrent/atomic/AtomicLong.h
index c70a4e6..0d0c3b0 100644
--- a/libjava/java/util/concurrent/atomic/AtomicLong.h
+++ b/libjava/java/util/concurrent/atomic/AtomicLong.h
@@ -49,7 +49,7 @@ private:
 public: // actually package-private
   static jboolean VM_SUPPORTS_LONG_CAS;
 private:
-  volatile jlong __attribute__((aligned(__alignof__( ::java::lang::Number)))) value;
+  jlong volatile __attribute__((aligned(__alignof__( ::java::lang::Number)))) value;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/java/util/concurrent/atomic/AtomicReference.h b/libjava/java/util/concurrent/atomic/AtomicReference.h
index e8862e8..363fca6 100644
--- a/libjava/java/util/concurrent/atomic/AtomicReference.h
+++ b/libjava/java/util/concurrent/atomic/AtomicReference.h
@@ -35,7 +35,7 @@ private:
   static const jlong serialVersionUID = -1848883965231344442LL;
   static ::sun::misc::Unsafe * unsafe;
   static jlong valueOffset;
-  volatile ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
+  ::java::lang::Object * volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$Node.h b/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$Node.h
index 423f2a0..0976920 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 1e95c3d3..41f1f7c 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 0abbb8f..cc49550 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 fc2b9df..e50fcef 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:
diff --git a/libjava/java/util/logging/ErrorManager.h b/libjava/java/util/logging/ErrorManager.h
index e6c115e..58d48c9 100644
--- a/libjava/java/util/logging/ErrorManager.h
+++ b/libjava/java/util/logging/ErrorManager.h
@@ -21,7 +21,7 @@ public:
   static const jint OPEN_FAILURE = 4;
   static const jint FORMAT_FAILURE = 5;
 private:
-  volatile jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) everUsed;
+  jboolean volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) everUsed;
 public:
   static ::java::lang::Class class$;
 };
-- 
cgit v1.1