Permalink
Browse files

2003-05-31 Paolo Bonzini <bonzini@gnu.org>

	PR libjava/32098
	* libtool.m4: Revert previous change.
	* ltgcc.m4: Put it here.

libjava:
2007-05-31  Paolo Bonzini  <bonzini@gnu.org>

	PR libjava/32098
	* configure: Regenerated.
	* aclocal.m4: Regenerated.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@125215 138bc75d-0d04-0410-961f-82ee72b054a4
  • Loading branch information...
bonzini
bonzini committed May 31, 2007
1 parent 0448520 commit 796f6ddf517349e46196845a0d9ce5322495c4d0
Showing with 89 additions and 26 deletions.
  1. +6 −0 ChangeLog
  2. +6 −0 libjava/ChangeLog
  3. +1 −0 libjava/aclocal.m4
  4. +13 −19 libjava/configure
  5. +3 −7 libtool.m4
  6. +60 −0 ltgcc.m4
View
@@ -1,3 +1,9 @@
+2003-05-31 Paolo Bonzini <bonzini@gnu.org>
+
+ PR libjava/32098
+ * libtool.m4: Revert previous change.
+ * ltgcc.m4: Put it here.
+
2003-05-30 Zdenek Dvorak <dvorakz@suse.cz>
* MAINTAINERS (Various Maintainers): Add myself as
View
@@ -1,3 +1,9 @@
+2007-05-31 Paolo Bonzini <bonzini@gnu.org>
+
+ PR libjava/32098
+ * configure: Regenerated.
+ * aclocal.m4: Regenerated.
+
2007-05-30 H.J. Lu <hongjiu.lu@intel.com>
PR libjava/32098
View
@@ -7319,6 +7319,7 @@ m4_include([../config/no-executables.m4])
m4_include([../config/tls.m4])
m4_include([../config/unwind_ipinfo.m4])
m4_include([../libtool.m4])
+m4_include([../ltgcc.m4])
m4_include([../ltoptions.m4])
m4_include([../ltsugar.m4])
m4_include([../ltversion.m4])
View
@@ -15610,17 +15610,17 @@ fi
# Source file extension for Java test sources.
-ac_ext=java
+ac_ext=c
# Object file extension for compiled Java test sources.
objext=o
objext_GCJ=$objext
# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
+lt_simple_compile_test_code="int some_variable = 0;"
# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
+lt_simple_link_test_code='int main(){return(0);}'
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
@@ -15653,13 +15653,6 @@ _lt_linker_boilerplate=`cat conftest.err`
$RM conftest*
-# We can't call gcj to test gcj features when building libjava in gcc
-# since gcj may depend on ecj1 which may not be available yet. We use
-# gcc to test gcj features.
-ac_ext=c
-lt_simple_compile_test_code="int some_variable = 0;"
-lt_simple_link_test_code='int main(){return(0);}'
-
# Allow CC to be a program name with arguments.
compiler=$CC
compiler_GCJ=$CC
@@ -15708,11 +15701,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15711: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15704: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15715: \$? = $ac_status" >&5
+ echo "$as_me:15708: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16024,11 +16017,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16027: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16020: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16031: \$? = $ac_status" >&5
+ echo "$as_me:16024: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16123,11 +16116,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16126: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16119: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16130: \$? = $ac_status" >&5
+ echo "$as_me:16123: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16175,11 +16168,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16178: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16171: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16182: \$? = $ac_status" >&5
+ echo "$as_me:16175: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18182,6 +18175,7 @@ fi
fi
+compiler_GCJ=${GCJ-gcj}
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -18501,7 +18495,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then
:
else
cat > conftest.$ac_ext << EOF
-#line 18504 "configure"
+#line 18498 "configure"
struct S { ~S(); };
void bar();
void foo()
View
@@ -6757,14 +6757,9 @@ _LT_TAG_COMPILER
_LT_COMPILER_BOILERPLATE
_LT_LINKER_BOILERPLATE
-# We can't call gcj to test gcj features when building libjava in gcc
-# since gcj may depend on ecj1 which may not be available yet. We use
-# gcc to test gcj features.
-ac_ext=c
-lt_simple_compile_test_code="int some_variable = 0;"
-lt_simple_link_test_code='int main(){return(0);}'
-
# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${GCJ-"gcj"}
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
@@ -6791,6 +6786,7 @@ if test -n "$compiler"; then
fi
AC_LANG_RESTORE
+CC="$lt_save_CC"
])# _LT_LANG_GCJ_CONFIG
View
@@ -0,0 +1,60 @@
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined. These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'. Locally modified to
+# run its tests on C programs, because we cannot link Java programs until
+# we have finished building libjava.
+AC_DEFUN([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=c
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+ _LT_COMPILER_NO_RTTI($1)
+ _LT_COMPILER_PIC($1)
+ _LT_COMPILER_C_O($1)
+ _LT_COMPILER_FILE_LOCKS($1)
+ _LT_LINKER_SHLIBS($1)
+ _LT_SYS_DYNAMIC_LINKER($1)
+ _LT_LINKER_HARDCODE_LIBPATH($1)
+
+ _LT_CONFIG($1)
+fi
+
+_LT_TAGVAR(compiler, $1)=${GCJ-gcj}
+AC_LANG_RESTORE
+])# _LT_LANG_GCJ_CONFIG

0 comments on commit 796f6dd

Please sign in to comment.