Index: compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
===================================================================
RCS file: /home/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java,v
retrieving revision 1.140
diff -u -r1.140 CompilerOptions.java
--- compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java	16 Jun 2005 17:09:48 -0000	1.140
+++ compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java	21 Jun 2005 19:42:25 -0000
@@ -181,6 +181,14 @@
 	public static final long DiscouragedReference = ASTNode.Bit44L;
 	public static final long UnhandledWarningToken = ASTNode.Bit45L;
 	
+	// TODO remove once http://gcc.gnu.org/bugzilla/show_bug.cgi?id=21540 is fixed
+	private static final int IntMissingSerialVersion = (int) (MissingSerialVersion >>> 32);
+	private static final int IntAutoBoxing = (int) (Autoboxing >>> 32);
+	private static final int IntTypeParameterHiding = (int) (TypeParameterHiding >>> 32);
+	private static final int IntIncompleteEnumSwitch = (int) (IncompleteEnumSwitch >>> 32);
+	private static final int IntMissingDeprecatedAnnotation = (int) (MissingDeprecatedAnnotation >>> 32);
+	
+	
 	// Default severity level for handlers
 	public long errorThreshold = 0;
 		
@@ -904,16 +912,17 @@
 			}
 		} else {
 			irritantInt = (int)(irritant >>> 32);
+			// TODO remove contants once http://gcc.gnu.org/bugzilla/show_bug.cgi?id=21540 is fixed
 			switch (irritantInt) {
-				case (int) (MissingSerialVersion >>> 32) :
+				case IntMissingSerialVersion :
 					return "serial"; //$NON-NLS-1$
-				case (int) (Autoboxing >>> 32) :
+				case IntAutoBoxing :
 					return "boxing"; //$NON-NLS-1$
-				case (int) (TypeParameterHiding >>> 32) :
+				case IntTypeParameterHiding :
 					return "hiding"; //$NON-NLS-1$
-				case (int) (IncompleteEnumSwitch >>> 32) :
+				case IntIncompleteEnumSwitch :
 					return "incomplete-switch"; //$NON-NLS-1$
-				case (int) (MissingDeprecatedAnnotation >>> 32) :
+				case IntMissingDeprecatedAnnotation :
 					return "dep-ann"; //$NON-NLS-1$
 			}
 		}
Index: compiler/org/eclipse/jdt/internal/compiler/util/Messages.java
===================================================================
RCS file: /home/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/Messages.java,v
retrieving revision 1.3
diff -u -r1.3 Messages.java
--- compiler/org/eclipse/jdt/internal/compiler/util/Messages.java	11 Apr 2005 15:37:37 -0000	1.3
+++ compiler/org/eclipse/jdt/internal/compiler/util/Messages.java	21 Jun 2005 19:42:25 -0000
@@ -71,7 +71,7 @@
 	private static String[] nlSuffixes;
 	private static final String EXTENSION = ".properties"; //$NON-NLS-1$
 
-	private static final String BUNDLE_NAME = "org.eclipse.jdt.internal.compiler.util.messages";//$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.jdt.internal.compiler.messages";//$NON-NLS-1$
 
 	private Messages() {
 		// Do not instantiate
Index: compiler/org/eclipse/jdt/internal/compiler/util/messages.properties
===================================================================
RCS file: compiler/org/eclipse/jdt/internal/compiler/util/messages.properties
diff -N compiler/org/eclipse/jdt/internal/compiler/util/messages.properties
--- compiler/org/eclipse/jdt/internal/compiler/util/messages.properties	11 Apr 2005 15:37:37 -0000	1.20
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,62 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-### Eclipse Java Core Compiler messages.
-
-### compilation
-compilation_unresolvedProblem =  Unresolved compilation problem: \n
-compilation_unresolvedProblems = Unresolved compilation problems: \n
-compilation_request    = [parsing    {2} - #{0}/{1}]
-compilation_loadBinary = [reading    {0}.class]
-compilation_process    = [analyzing  {2} - #{0}/{1}]
-compilation_write      = [writing    {1} - #{0}]
-compilation_done       = [completed  {2} - #{0}/{1}]
-compilation_units      = [{0} units compiled]
-compilation_unit       = [{0} unit compiled]
-compilation_internalError = Internal compiler error
-
-### output
-output_isFile =  The outDir is a file : {0}
-output_isFileNotDirectory = The outDir is a file not a directory.
-output_dirName =  The output dir name is : {0}
-output_notValidAll =  The outDir is not a valid directory name. All the directories cannot be created.
-output_fileName =  file name : {0}
-output_notValid = The outDir is not a valid directory name. The directory cannot be created.
-
-### problem
-problem_noSourceInformation = \n!! no source information available !!
-problem_atLine = (at line {0})
-
-### abort
-abort_invalidAttribute = SANITY CHECK: Invalid attribute for local variable {0}
-abort_missingCode = Missing code implementation in the compiler
-abort_againstSourceModel = Cannot compile against source model {0} issued from {1}
-
-### accept
-accept_cannot = Cannot accept the compilation unit:
-
-### parser
-parser_incorrectPath = The path for the javadcl.java file is incorrect
-parser_moveFiles = MOVE FILES IN THE Runtime DIRECTORY OF Parser.class
-parser_syntaxRecovery = SYNTAX RECOVERY
-parser_regularParse = REGULAR PARSE
-parser_missingFile = missing file {0}
-parser_corruptedFile = corrupted file {0}
-parser_endOfFile = end of file
-parser_endOfConstructor = end of constructor
-parser_endOfMethod = end of method
-parser_endOfInitializer = end of initializer
-
-### ast
-ast_missingCode = Missing code gen implementation
-
-### constant
-constant_cannotCastedInto =  {0} constant cannot be casted into {1}
-constant_cannotConvertedTo = {0} constant cannot be converted to {1}
Index: compiler/org/eclipse/jdt/internal/compiler/messages.properties
===================================================================
RCS file: compiler/org/eclipse/jdt/internal/compiler/messages.properties
diff -N compiler/org/eclipse/jdt/internal/compiler/messages.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ compiler/org/eclipse/jdt/internal/compiler/messages.properties	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,62 @@
+###############################################################################
+# Copyright (c) 2000, 2004 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+### Eclipse Java Core Compiler messages.
+
+### compilation
+compilation_unresolvedProblem =  Unresolved compilation problem: \n
+compilation_unresolvedProblems = Unresolved compilation problems: \n
+compilation_request    = [parsing    {2} - #{0}/{1}]
+compilation_loadBinary = [reading    {0}.class]
+compilation_process    = [analyzing  {2} - #{0}/{1}]
+compilation_write      = [writing    {1} - #{0}]
+compilation_done       = [completed  {2} - #{0}/{1}]
+compilation_units      = [{0} units compiled]
+compilation_unit       = [{0} unit compiled]
+compilation_internalError = Internal compiler error
+
+### output
+output_isFile =  The outDir is a file : {0}
+output_isFileNotDirectory = The outDir is a file not a directory.
+output_dirName =  The output dir name is : {0}
+output_notValidAll =  The outDir is not a valid directory name. All the directories cannot be created.
+output_fileName =  file name : {0}
+output_notValid = The outDir is not a valid directory name. The directory cannot be created.
+
+### problem
+problem_noSourceInformation = \n!! no source information available !!
+problem_atLine = (at line {0})
+
+### abort
+abort_invalidAttribute = SANITY CHECK: Invalid attribute for local variable {0}
+abort_missingCode = Missing code implementation in the compiler
+abort_againstSourceModel = Cannot compile against source model {0} issued from {1}
+
+### accept
+accept_cannot = Cannot accept the compilation unit:
+
+### parser
+parser_incorrectPath = The path for the javadcl.java file is incorrect
+parser_moveFiles = MOVE FILES IN THE Runtime DIRECTORY OF Parser.class
+parser_syntaxRecovery = SYNTAX RECOVERY
+parser_regularParse = REGULAR PARSE
+parser_missingFile = missing file {0}
+parser_corruptedFile = corrupted file {0}
+parser_endOfFile = end of file
+parser_endOfConstructor = end of constructor
+parser_endOfMethod = end of method
+parser_endOfInitializer = end of initializer
+
+### ast
+ast_missingCode = Missing code gen implementation
+
+### constant
+constant_cannotCastedInto =  {0} constant cannot be casted into {1}
+constant_cannotConvertedTo = {0} constant cannot be converted to {1}