From ad677a4c00c6382897e77ffc2a59aed0f5a59682 Mon Sep 17 00:00:00 2001 From: bstarynk Date: Fri, 18 Dec 2009 17:44:06 +0000 Subject: 2009-12-18 Basile Starynkevitch MELT branch merged with trunk rev 155344 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@155348 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 6 ++++++ libjava/configure | 30 ++++++++++++------------------ libjava/configure.ac | 15 +-------------- 3 files changed, 19 insertions(+), 32 deletions(-) (limited to 'libjava') diff --git a/libjava/ChangeLog b/libjava/ChangeLog index adef8782f74..0701bd395a7 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2009-12-14 Ralf Wildenhues + + * configure.ac: Remove code to un-precious-ize CC, CXX, + CXXFLAGS, CFLAGS, LDFLAGS. + * configure: Regenerate. + 2009-12-09 John David Anglin * include/pa-signal.h: Do not include ucontext.h. diff --git a/libjava/configure b/libjava/configure index 1a7d625c96d..605225b19a0 100755 --- a/libjava/configure +++ b/libjava/configure @@ -961,8 +961,15 @@ with_jvm_jar_dir ac_precious_vars='build_alias host_alias target_alias -CPP +CC +CFLAGS +LDFLAGS +LIBS CPPFLAGS +CXX +CXXFLAGS +CCC +CPP CXXCPP XMKMF' ac_subdirs_all='classpath libltdl' @@ -3339,18 +3346,9 @@ fi # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX. -# (1) We use an abnormal CXX (without library references), so we -# must cache it under a different name. -# (2) CC, CFLAGS, CXX, CXXFLAGS, LDFLAGS must not be 'precious', or -# the non-multilib-adjusted value will be used in multilibs. -# (3) As a side effect, we must SUBST CXXFLAGS, CFLAGS, and LDFLAGS ourselves. -# (4) As another side effect, automake doesn't automatically include them -# in Makefile.in. -# (5) For libstdc++-v3, -fno-builtin must be present here so that a +# For libstdc++-v3, -fno-builtin must be present here so that a # non-conflicting form of std::exit can be guessed by AC_PROG_CXX, and # used in later tests. This may not be necessary in libjava; I don't know. - - save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -fno-builtin" ac_ext=c @@ -4406,10 +4404,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CXXFLAGS="$save_CXXFLAGS" - - - - am__api_version='1.11' # Find a good install program. We prefer a C program (faster), @@ -13244,7 +13238,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13247 "configure" +#line 13241 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13350,7 +13344,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13353 "configure" +#line 13347 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19215,7 +19209,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : enableval=$enable_sjlj_exceptions; : else cat > conftest.$ac_ext << EOF -#line 19218 "configure" +#line 19212 "configure" struct S { ~S(); }; void bar(); void foo() diff --git a/libjava/configure.ac b/libjava/configure.ac index d8cb6103fea..3721e1c34ed 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -142,27 +142,14 @@ AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes) # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX. GCC_NO_EXECUTABLES -# (1) We use an abnormal CXX (without library references), so we -# must cache it under a different name. -# (2) CC, CFLAGS, CXX, CXXFLAGS, LDFLAGS must not be 'precious', or -# the non-multilib-adjusted value will be used in multilibs. -# (3) As a side effect, we must SUBST CXXFLAGS, CFLAGS, and LDFLAGS ourselves. -# (4) As another side effect, automake doesn't automatically include them -# in Makefile.in. -# (5) For libstdc++-v3, -fno-builtin must be present here so that a +# For libstdc++-v3, -fno-builtin must be present here so that a # non-conflicting form of std::exit can be guessed by AC_PROG_CXX, and # used in later tests. This may not be necessary in libjava; I don't know. -m4_rename([_AC_ARG_VAR_PRECIOUS],[glibcxx_PRECIOUS]) -m4_define([_AC_ARG_VAR_PRECIOUS],[]) save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -fno-builtin" AC_PROG_CC AC_PROG_CXX CXXFLAGS="$save_CXXFLAGS" -m4_rename_force([glibcxx_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) -AC_SUBST(CFLAGS) -AC_SUBST(CXXFLAGS) -AC_SUBST(LDFLAGS) AM_INIT_AUTOMAKE([1.9.0]) -- cgit v1.2.1