libjava

	* Updated headers.
libjava/classpath
	* tools/gnu/classpath/tools/javah/FieldHelper.java (print): Print
	'volatile' after field type.

From-SVN: r121215

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 142d36da57736113b3b16d6e9159cffa3fd81649..1738f98170492ca457b0a7b633e54ef25d0174ff 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-26  Tom Tromey  <tromey@redhat.com>
+
+       * Updated headers.
+
 2007-01-25  Tom Tromey  <tromey@redhat.com>
 
        PR libgcj/29594:

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 489b9aa8cf7d2af2e98b73f2f8a17d4b1ba2d56c..ef572ddc2c83c8d7b21950c6aa177942d80fba74 100644 (file)
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-26  Tom Tromey  <tromey@redhat.com>
+
+       * tools/gnu/classpath/tools/javah/FieldHelper.java (print): Print
+       'volatile' after field type.
+
 2007-01-23  Marco Trudel  <mtrudel@gmx.ch>
 
        * java/util/Arrays.java (binarySearch): Change comparison order.

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class
index 430344c87c74214663d96c4af507f6340516c1a8..9b7169fe51961148101d284ae24c515c1bd7a819 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class differ

diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/FieldHelper.java b/libjava/classpath/tools/gnu/classpath/tools/javah/FieldHelper.java
index a9385e04d337f5221127c353b7ae46b3f60e7864..f1c369af267afd538fa94a34067f9e069b1782fe 100644 (file)
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/FieldHelper.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/FieldHelper.java
@@ -1,5 +1,5 @@
 /* FieldHelper.java - field helper methods for CNI
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
  This file is part of GNU Classpath.
 
@@ -52,12 +52,12 @@ public class FieldHelper
     out.print("  ");
     if (Modifier.isStatic(field.access))
       out.print("static ");
-    if (Modifier.isVolatile(field.access))
-      out.print("volatile ");
     if ((field.value instanceof Integer) || (field.value instanceof Long))
       out.print("const ");
     out.print(Type.getType(field.desc));
     out.print(" ");
+    if (Modifier.isVolatile(field.access))
+      out.print("volatile ");
     boolean result = false;
     if (superType != null && ! Modifier.isStatic(field.access))
       {

diff --git a/libjava/gnu/awt/xlib/XEventLoop.h b/libjava/gnu/awt/xlib/XEventLoop.h
index 0827f8aaa9a002bf570d364a2e49971a5538cad6..8061e9a94414b6d8cce405a4edbc98fc8bf2b81b 100644 (file)
--- a/libjava/gnu/awt/xlib/XEventLoop.h
+++ b/libjava/gnu/awt/xlib/XEventLoop.h
@@ -67,7 +67,7 @@ private:
   ::java::lang::Thread * eventLoopThread;
 public: // actually package-private
   ::gnu::awt::LightweightRedirector * lightweightRedirector;
-  volatile jboolean idle;
+  jboolean volatile idle;
 public:
   static ::java::lang::Class class$;
 };

diff --git a/libjava/gnu/java/awt/peer/gtk/GThreadMutex.h b/libjava/gnu/java/awt/peer/gtk/GThreadMutex.h
index 9380a5dda27dac97e4674807db79d5f2d1f36b36..c788e827531b281a12eb2fc0c2bc2a995f170307 100644 (file)
--- a/libjava/gnu/java/awt/peer/gtk/GThreadMutex.h
+++ b/libjava/gnu/java/awt/peer/gtk/GThreadMutex.h
@@ -32,7 +32,7 @@ class gnu::java::awt::peer::gtk::GThreadMutex : public ::java::lang::Object
 
 public: // actually package-private
   GThreadMutex();
-  volatile jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) potentialLockers;
+  jint volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) potentialLockers;
   ::java::lang::Object * lockForPotentialLockers;
 public:
   static ::java::lang::Class class$;

diff --git a/libjava/gnu/java/rmi/server/ConnectionRunnerPool$ConnectionRunner.h b/libjava/gnu/java/rmi/server/ConnectionRunnerPool$ConnectionRunner.h
index 9b98afc9e1340f7f488298ca61fdead7d6731877..664fc4e121c1346abae5c5004a82d44af0d4d1e2 100644 (file)
--- a/libjava/gnu/java/rmi/server/ConnectionRunnerPool$ConnectionRunner.h
+++ b/libjava/gnu/java/rmi/server/ConnectionRunnerPool$ConnectionRunner.h
@@ -36,7 +36,7 @@ public: // actually package-private
   virtual void exit();
 private:
   ::gnu::java::rmi::server::UnicastConnection * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) conn;
-  volatile jboolean exiting;
+  jboolean volatile exiting;
 public:
   static ::java::lang::Class class$;
 };

diff --git a/libjava/gnu/java/rmi/server/UnicastConnectionManager.h b/libjava/gnu/java/rmi/server/UnicastConnectionManager.h
index dd6b828317dcb32b6558445e33648041b72c63b4..26c19ccc2ba118fa83236b7f0785764184370b45 100644 (file)
--- a/libjava/gnu/java/rmi/server/UnicastConnectionManager.h
+++ b/libjava/gnu/java/rmi/server/UnicastConnectionManager.h
@@ -70,7 +70,7 @@ public: // actually package-private
   static ::java::util::Hashtable * clients;
   ::java::util::ArrayList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) connections;
 private:
-  volatile ::java::lang::Thread * serverThread;
+  ::java::lang::Thread * volatile serverThread;
   ::java::net::ServerSocket * ssock;
 public: // actually package-private
   ::java::lang::String * serverName;

diff --git a/libjava/java/lang/SecurityManager.h b/libjava/java/lang/SecurityManager.h
index 28ef484c3cea2f9d66501bc4cdfc07c0ba1573ea..8abaa6a7e08ce4e5da34a129ce1b43764f24abbf 100644 (file)
--- 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 c3556f0684d8d5427b496a475615e31ddfae9d5e..74e149030f76607f1646dbd79bf65724e7260927 100644 (file)
--- a/libjava/java/lang/Thread.h
+++ b/libjava/java/lang/Thread.h
@@ -144,7 +144,7 @@ public: // actually package-private
   static const jbyte THREAD_PARK_DEAD = 3;
   ::java::lang::Object * accessControlState;
   ::gnu::gcj::RawData * interp_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 32a1e31acdf246ad96f4e23af6c643de4e8f363a..0013a3fc8ca9fe9024ad373c76e83cd19176d107 100644 (file)
--- 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 730394d1c23d7b74feb62780cfd08e9452d0aee1..2667ed07c5bccce4ce43ca6db39589086d10240e 100644 (file)
--- 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 aaa2a7ae10d4edda2c5d78da35b12c9692519e58..55d06e8698f3f88cb809804ff616bbe8ff1feef9 100644 (file)
--- 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 60fee41a4d0228c7aa1c5be419722a454a417c7b..af69ba60a4e9b26f93588a0ba7b92dff7ab23c7c 100644 (file)
--- 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 281690e36fb84b5284d39869d957d4c328aed9d3..512bc0e07369f99210bb3d9c370e4f1fab154779 100644 (file)
--- 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 c71b25bd327ba9ef1d8810b240d8797642e2e316..629cff881e92431da699b44b33aef2648df46e11 100644 (file)
--- 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 1b94c35907128551792db451b30bda10f7ecd8d8..c9d5d890d1ccb26dd20fa3e6bfeceeff62a9e00e 100644 (file)
--- 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 4d42f54688a44881a3c894590da1d5993d473db5..be9beb80ca9db6784e8473c945088f5ab77b00d6 100644 (file)
--- 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 5e1087b7611464268730fad09854ae35f1166db6..4bd3890eac80e35d35d18b4c466971afbfec81e7 100644 (file)
--- 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 5ed4d252a900ad8f23c69b1e043b1604ecb51724..5a0993e2656b3f4d4c30907e42c92522e3500620 100644 (file)
--- 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 18808697181bc958860c2e6f1f7863e3bd0b9145..edaa1cad7bd9e1481f123bb92b230604d5859060 100644 (file)
--- 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 36d1f654a64cd0ad2a32fe5cc24014fe115691ae..1cf8cda9db841eed1ec759b665489b8e5a0b7080 100644 (file)
--- 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 e01b42074bf0d8ea732bd827013e1e093b5bd7a8..8e651b36a5331ec3d9bd70c79cd6d5bb5b1cf873 100644 (file)
--- 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 07486a9abf8842aacdc9ccee694b3cf237a6941d..105c64e665904d203e88f2e505147d02a11d2265 100644 (file)
--- 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 d1b55c99983c9671a52760b05443132593230b49..921c36377f7df3e08872fbf90d81cc963c913f4b 100644 (file)
--- 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 77af8cb17f4af3002be875d56ccfbbbb6851c730..48e22f2a68da4037e36e1da11b4ef0bcac139649 100644 (file)
--- 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 b29138fede41f81aed7dc5a0286e3309fc1c6f39..5722c419bf4816b35a62712b2c23ad9bff58f9d3 100644 (file)
--- 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 82ecce492c17f2c1a4370c1c75a94f4e22173fa8..7606ddcfe4979295e8eacec1138412337221932a 100644 (file)
--- 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 18d3f3204a327fda41d9fac88da86056d1c6954d..a1b5dc3feee35c0a14831196358287962b85d3eb 100644 (file)
--- 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 00b9dde7c9fa1a1600a6844d1a635300a7141ea0..b69b1f6559933cc69ba83a88b0ca5a2c78729544 100644 (file)
--- 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 08a6d597e14a9cbde2b8d9371770e19d1864b49c..60d22a952ae91c97ef643d34819da661d3f9f8e0 100644 (file)
--- 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 286aff1d003c6c5efa9ac81a1fdd6093d063857d..136a578b514230d104afc9e060ece7c2b5d2cef0 100644 (file)
--- 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 c70a4e6d83972ca9db1687078cf566e301fbb586..0d0c3b00f3eaacc85bc2a46735caef4a4ff3f5f7 100644 (file)
--- 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 e8862e8433f84cf10c5ad1b4327277ee1f453348..363fca6ea10730ea11b804ab5febca3ff28f1753 100644 (file)
--- 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 423f2a063566db03d784fd10a70f054cad351149..0976920620ff5cbca0c097d34c25eba5a0c697a1 100644 (file)
--- 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 1e95c3d34b8890168e14422d36cd09a37653642f..41f1f7cba883f6727dbbb59592e172b137ce03d0 100644 (file)
--- 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 0abbb8fd23a502b84065dbbb42eee3a5590138da..cc49550577d0307c9490adc510e58dcd8740420f 100644 (file)
--- 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 fc2b9df033d8c5561a4f8e0935b3bd16ab04323c..e50fcef61af2ddda684903bfadd38d866ea74537 100644 (file)
--- 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 e6c115e29d8473e57a0c5ccbfe54466034e5ac9e..58d48c9e2a8f69e68ecf105af1b53f5fd12414da 100644 (file)
--- 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$;
 };

diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h
index 5d8697b83c517b284a8d6fc94de14a4e45480e9f..2b6cc2a134e25a53b00b6c681dc6c1ce89946df3 100644 (file)
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h
+++ b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h
@@ -46,7 +46,7 @@ public:
   void mouseReleased(::java::awt::event::MouseEvent *);
 public: // actually package-private
   void increment();
-  volatile jboolean __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) mouseDown;
+  jboolean volatile __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) mouseDown;
   ::javax::swing::Timer * timer;
   ::javax::swing::plaf::basic::BasicSpinnerUI * this$0;
 public:

diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h
index 0d9dddce85a2c5ac339fcac932943205ac1a3940..c6e68952cb622f6c3b8effec30198dfc17e17ffc 100644 (file)
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h
+++ b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h
@@ -46,7 +46,7 @@ public:
   void mouseReleased(::java::awt::event::MouseEvent *);
 public: // actually package-private
   void decrement();
-  volatile jboolean __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) mouseDown;
+  jboolean volatile __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) mouseDown;
   ::javax::swing::Timer * timer;
   ::javax::swing::plaf::basic::BasicSpinnerUI * this$0;
 public: