From 2772ef3ef33609dd64209323e9418a847685971a Mon Sep 17 00:00:00 2001
From: Neil Booth <neil@daikokuya.co.uk>
Date: Sat, 7 Jun 2003 11:10:46 +0000
Subject: Makefile.in (OJBS, c-opts.o): Update.

	* Makefile.in (OJBS, c-opts.o): Update.
	(c-options.c, c-options.h): Rename options.h and options.c.
	(options.h): Rename options_.h.
	(opts.o): New.
	* c-common.h (c_common_handle_option): Replace c_common_decode_option.
	(c_common_init_options): Update prototype.
	* c-lang.c (c_init_options): Update prototype.
	(LANG_HOOKS_HANDLE_OPTION): Override.
	(LANG_HOOKS_DECODE_OPTION): Drop.
	* c-opts.c: Include opts.h and options.h instead of c-options.h
	and c-options.c.
	(lang_flags): Move to file scope.
	(find_opt, c_common_decode_option): Remove.
	(CL_C, CL_OBJC, CL_CXX, CL_OBJCXX, CL_JOINED, CL_SEPARATE,
	CL_REJECT_NEGATIVE): Move to opts.h.
	(missing_arg): Update prototype.
	(c_common_init_options): Update for new prototype.
	(c_common_handle_options): Filenames are passed as N_OPTS.
	* hooks.c (hook_int_void_0): New.
	* hooks.h (hook_int_void_0): New.
	* langhooks-def.h (LANG_HOOKS_INIT_OPTIONS): New default.
	(LANG_HOOKS_HANDLE_OPTION): Default to NULL for now.
	(LANG_HOOKS_INITIALIZER): Update.
	* langhooks.h (init_options): Update.
	(handle_option): New.
	* opts.c, opts.h: New files.
	* opts.sh: Update c file to include opts.h and options.h.
	* toplev.c: Include opts.h; change options.h to options_.h.
	(parse_options_and_default_flags): Get lang_mask, use
	handle_option for language-specific handling.
	* objc/objc-lang.c (LANG_HOOKS_DECODE_OPTON): Drop.
	(LANG_HOOKS_HANDLE_OPTION): Override.
	(objc_init_options): Update.
ada:
	* misc.c (gnat_init_options): Update.
cp:
	* cp-lang.c (LANG_HOOKS_DECODE_OPTON): Drop.
	(LANG_HOOKS_HANDLE_OPTION): Override.
	* cp-tree.h (cxx_init_options): Update.
	* lex.c (cxx_init_options): Update.
f:
	* com.c (ffe_init_options): Update.
java:
	* lang.c (java_init_options): Update.

From-SVN: r67584
---
 gcc/java/ChangeLog | 4 ++++
 gcc/java/lang.c    | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'gcc/java')

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 2c6d3f9..f06a3c6 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-07  Neil Booth  <neil@daikokuya.co.uk>
+
+	* lang.c (java_init_options): Update.
+
 Thu Jun  5 18:33:40 CEST 2003  Jan Hubicka  <jh@suse.cz>
 
 	* Make-lang.in:  Add support for stageprofile and stagefeedback
diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index 918be0a..28be548 100644
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -55,7 +55,7 @@ struct string_option
 
 static bool java_init (void);
 static void java_finish (void);
-static void java_init_options (void);
+static int java_init_options (void);
 static bool java_post_options (const char **);
 
 static int java_decode_option (int, char **);
@@ -731,7 +731,7 @@ void lang_init_source (int level)
   inhibit_error_function_printing = (level == 1);
 }
 
-static void
+static int
 java_init_options (void)
 {
   flag_bounds_check = 1;
@@ -743,6 +743,8 @@ java_init_options (void)
 
   /* In Java arithmetic overflow always wraps around.  */
   flag_wrapv = 1;
+
+  return 0;
 }
 
 static bool
-- 
cgit v1.1