From a73a02d4abe0f60de65430a0a424523328183dac Mon Sep 17 00:00:00 2001 From: bstarynk Date: Tue, 22 Feb 2011 15:46:28 +0000 Subject: 2011-02-22 Basile Starynkevitch MELT branch merged with trunk rev 170399 using svnmerge git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@170403 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 19 ++++++++++++++++ libjava/classpath/ChangeLog.gcj | 6 +++++ libjava/classpath/config.rpath | 5 ----- libjava/classpath/configure | 24 +++++--------------- libjava/classpath/ltcf-c.sh | 4 ---- libjava/classpath/ltcf-gcj.sh | 4 ---- libjava/classpath/ltconfig | 4 ---- libjava/configure | 45 ++++++++++---------------------------- libjava/configure.ac | 19 +++++++--------- libjava/contrib/aot-compile-rpm.in | 4 ++-- libjava/contrib/aot-compile.in | 4 ++-- libjava/libltdl/ChangeLog | 7 ++++++ libjava/libltdl/acinclude.m4 | 8 ------- libjava/libltdl/configure | 16 ++++---------- libjava/shlibpath.m4 | 4 ---- 15 files changed, 65 insertions(+), 108 deletions(-) (limited to 'libjava') diff --git a/libjava/ChangeLog b/libjava/ChangeLog index fd297fd4b9b..733c786ea8e 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,22 @@ +2011-02-14 Gary Benson + + * libjava/contrib/aot-compile.in: Add our module directory + to the start of the search path rather than the end. + * libjava/contrib/aot-compile-rpm.in: Likewise. + +2011-02-14 Gary Benson + + PR libjava/47484 + * configure.ac (python_mod_dir, python_mod_dir_expanded): + Install Python modules into versioned directory. + * configure: Regenerate. + +2011-02-13 Ralf Wildenhues + + * configure: Regenerate. + * shlibpath.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER): Remove handling + of freebsd1* which soon would incorrectly match FreeBSD 10.0. + 2011-02-04 Ralf Wildenhues PR java/21206 diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index 84c35ed7d77..9eb70ac14e5 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,9 @@ +2011-02-13 Ralf Wildenhues + + * config.rpath, ltcf-c.sh, ltcf-gcj.sh, ltconfig: Remove + handling of freebsd1* which soon would match FreeBSD 10.0. + * configure: Regenerate. + 2011-01-31 Alexandre Oliva * configure.ac (GCJ_JAVAC): Run false rather than no. diff --git a/libjava/classpath/config.rpath b/libjava/classpath/config.rpath index 17298f2348b..def43dcc5e7 100755 --- a/libjava/classpath/config.rpath +++ b/libjava/classpath/config.rpath @@ -357,9 +357,6 @@ else dgux*) hardcode_libdir_flag_spec='-L$libdir' ;; - freebsd1*) - ld_shlibs=no - ;; freebsd2.2*) hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -534,8 +531,6 @@ case "$host_os" in dgux*) library_names_spec='$libname$shrext' ;; - freebsd1*) - ;; freebsd* | dragonfly*) case "$host_os" in freebsd[123]*) diff --git a/libjava/classpath/configure b/libjava/classpath/configure index fc05b834492..2274f648cf9 100755 --- a/libjava/classpath/configure +++ b/libjava/classpath/configure @@ -10013,10 +10013,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -10938,10 +10934,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -11819,7 +11811,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11822 "configure" +#line 11814 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11925,7 +11917,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11928 "configure" +#line 11920 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16001,10 +15993,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -23826,7 +23814,7 @@ else JAVA_TEST=Object.java CLASS_TEST=Object.class cat << \EOF > $JAVA_TEST -/* #line 23829 "configure" */ +/* #line 23817 "configure" */ package java.lang; public class Object @@ -23919,7 +23907,7 @@ EOF if uudecode$EXEEXT Test.uue; then ac_cv_prog_uudecode_base64=yes else - echo "configure: 23922: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: 23910: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: failed file was:" >&5 cat Test.uue >&5 ac_cv_prog_uudecode_base64=no @@ -23947,7 +23935,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class TEST=Test cat << \EOF > $JAVA_TEST -/* [#]line 23950 "configure" */ +/* [#]line 23938 "configure" */ public class Test { public static void main (String args[]) { System.exit (0); @@ -24155,7 +24143,7 @@ if test "x${use_glibj_zip}" = xfalse || \ JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST - /* #line 24158 "configure" */ + /* #line 24146 "configure" */ public class Test { public static void main(String args) diff --git a/libjava/classpath/ltcf-c.sh b/libjava/classpath/ltcf-c.sh index 5eb05db43f5..565e033254d 100644 --- a/libjava/classpath/ltcf-c.sh +++ b/libjava/classpath/ltcf-c.sh @@ -423,10 +423,6 @@ else link_all_deplibs=yes ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little diff --git a/libjava/classpath/ltcf-gcj.sh b/libjava/classpath/ltcf-gcj.sh index 3f1c2814a5d..b1a42d6d550 100644 --- a/libjava/classpath/ltcf-gcj.sh +++ b/libjava/classpath/ltcf-gcj.sh @@ -422,10 +422,6 @@ else ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little diff --git a/libjava/classpath/ltconfig b/libjava/classpath/ltconfig index cfbfda85dad..743d95135fb 100755 --- a/libjava/classpath/ltconfig +++ b/libjava/classpath/ltconfig @@ -1128,10 +1128,6 @@ darwin* | rhapsody*) sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` version_type=freebsd-$objformat diff --git a/libjava/configure b/libjava/configure index 481210d380a..f79e53b1e8d 100755 --- a/libjava/configure +++ b/libjava/configure @@ -6175,10 +6175,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -11550,10 +11546,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -12475,10 +12467,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -13356,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 13359 "configure" +#line 13347 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13462,7 +13450,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13465 "configure" +#line 13453 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16162,10 +16150,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -18522,10 +18506,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_shlibpath_var_GCJ=no ;; - freebsd1*) - ld_shlibs_GCJ=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -19463,7 +19443,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : enableval=$enable_sjlj_exceptions; : else cat > conftest.$ac_ext << EOF -#line 19466 "configure" +#line 19446 "configure" struct S { ~S(); }; void bar(); void foo() @@ -24651,25 +24631,22 @@ here=`${PWDCMD-pwd}` # We get this from the environment. +default_python_dir="/share/gcc-`cat ${srcdir}/../gcc/BASE-VER`/python/libjava" # Check whether --with-python-dir was given. if test "${with_python_dir+set}" = set; then : withval=$with_python_dir; with_python_dir=$withval else - with_python_dir="" + with_python_dir="${default_python_dir}" fi -if test "x${with_python_dir}" = "x" -then - # Needed for installing Python modules during make install. - python_mod_dir="\${prefix}/share/python" - # Needed for substituting into aot-compile* - python_mod_dir_expanded="${expanded_prefix}/share/python" -else - python_mod_dir="\${prefix}${with_python_dir}" - python_mod_dir_expanded="${expanded_prefix}${with_python_dir}" -fi +# Needed for installing Python modules during make install. +python_mod_dir="\${prefix}${with_python_dir}" + +# Needed for substituting into aot-compile* +python_mod_dir_expanded="${expanded_prefix}${with_python_dir}" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Python modules dir: ${python_mod_dir_expanded}" >&5 $as_echo "Python modules dir: ${python_mod_dir_expanded}" >&6; }; diff --git a/libjava/configure.ac b/libjava/configure.ac index a45cfc967d4..8187eecbd40 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1843,21 +1843,18 @@ AC_SUBST(here) # We get this from the environment. AC_SUBST(GCJFLAGS) +default_python_dir="/share/gcc-`cat ${srcdir}/../gcc/BASE-VER`/python/libjava" AC_ARG_WITH([python-dir], AS_HELP_STRING([--with-python-dir], [the location to install Python modules. This path should NOT include the prefix.]), - [with_python_dir=$withval], [with_python_dir=""]) + [with_python_dir=$withval], [with_python_dir="${default_python_dir}"]) + +# Needed for installing Python modules during make install. +python_mod_dir="\${prefix}${with_python_dir}" + +# Needed for substituting into aot-compile* +python_mod_dir_expanded="${expanded_prefix}${with_python_dir}" -if test "x${with_python_dir}" = "x" -then - # Needed for installing Python modules during make install. - python_mod_dir="\${prefix}/share/python" - # Needed for substituting into aot-compile* - python_mod_dir_expanded="${expanded_prefix}/share/python" -else - python_mod_dir="\${prefix}${with_python_dir}" - python_mod_dir_expanded="${expanded_prefix}${with_python_dir}" -fi AC_MSG_RESULT(Python modules dir: ${python_mod_dir_expanded}); AC_SUBST(python_mod_dir) AC_SUBST(python_mod_dir_expanded) diff --git a/libjava/contrib/aot-compile-rpm.in b/libjava/contrib/aot-compile-rpm.in index c3bdb165096..7d95632555d 100644 --- a/libjava/contrib/aot-compile-rpm.in +++ b/libjava/contrib/aot-compile-rpm.in @@ -1,6 +1,6 @@ #!/usr/bin/env python -## Copyright (C) 2005, 2006, 2007 Free Software Foundation +## Copyright (C) 2005, 2006, 2007, 2011 Free Software Foundation ## Written by Gary Benson ## ## This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ ## GNU General Public License for more details. import sys -sys.path.append("@python_mod_dir_expanded@") +sys.path.insert(0, "@python_mod_dir_expanded@") import aotcompile import os diff --git a/libjava/contrib/aot-compile.in b/libjava/contrib/aot-compile.in index b891f20b85f..91cfc67d99c 100644 --- a/libjava/contrib/aot-compile.in +++ b/libjava/contrib/aot-compile.in @@ -1,6 +1,6 @@ #!/usr/bin/env python -## Copyright (C) 2006 Free Software Foundation +## Copyright (C) 2006, 2011 Free Software Foundation ## Written by Gary Benson ## ## This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ ## GNU General Public License for more details. import sys -sys.path.append("@python_mod_dir_expanded@") +sys.path.insert(0, "@python_mod_dir_expanded@") import aotcompile import getopt import os diff --git a/libjava/libltdl/ChangeLog b/libjava/libltdl/ChangeLog index 7cc5e5494fa..708cb383578 100644 --- a/libjava/libltdl/ChangeLog +++ b/libjava/libltdl/ChangeLog @@ -1,3 +1,10 @@ +2011-02-13 Ralf Wildenhues + + * acinclude.m4 (AC_LIBTOOL_PROG_LD_SHLIBS) + (AC_LIBTOOL_SYS_DYNAMIC_LINKER): Remove handling + of freebsd1* which soon would incorrectly match FreeBSD 10.0. + * configure: Regenerate. + 2010-05-04 Ralf Wildenhues PR other/43620 diff --git a/libjava/libltdl/acinclude.m4 b/libjava/libltdl/acinclude.m4 index 53e3e5c19df..55beab162e7 100644 --- a/libjava/libltdl/acinclude.m4 +++ b/libjava/libltdl/acinclude.m4 @@ -1347,10 +1347,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - kfreebsd*-gnu) version_type=linux need_lib_prefix=no @@ -5661,10 +5657,6 @@ EOF _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little diff --git a/libjava/libltdl/configure b/libjava/libltdl/configure index e8380c1ec73..f47d95f7369 100755 --- a/libjava/libltdl/configure +++ b/libjava/libltdl/configure @@ -7343,10 +7343,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -7942,10 +7938,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - kfreebsd*-gnu) version_type=linux need_lib_prefix=no @@ -8107,7 +8099,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8110 "configure"' > conftest.$ac_ext + echo '#line 8102 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8660,7 +8652,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <