1 --- gcc/libjava/configure.ac 2006-01-23 18:53:45.000000000 +0100
2 +++ gcc/libjava/configure.ac 2006-02-26 16:02:13.828163000 +0100
4 *) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
5 esac], [multilib=yes])dnl
7 +# Default to --enable-libjava-multilib
8 +AC_ARG_ENABLE(libjava-multilib,
9 + AS_HELP_STRING([--enable-libjava-multilib],
10 + [build many library versions (default)]),
11 +[case "${enableval}" in
12 + yes) multilib=yes ;;
14 + *) AC_MSG_ERROR(bad value ${enableval} for libjava-multilib option) ;;
15 + esac], [multilib=yes])dnl
16 +if test "$multilib" = no; then
17 + # Reset also --enable-multilib state, as that is what is looked at
19 + ac_configure_args="$ac_configure_args --disable-multilib"
22 # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
25 --- gcc-4_2-branch/libjava/classpath/ltconfig.orig 2006-10-21 14:45:42.000000000 +0000
26 +++ gcc-4_2-branch/libjava/classpath/ltconfig 2006-12-29 18:28:13.000000000 +0000
27 @@ -1272,6 +1272,27 @@
28 # people can always --disable-shared, the test was removed, and we
29 # assume the GNU/Linux dynamic linker is in use.
30 dynamic_linker='GNU/Linux ld.so'
33 + # Find out which ABI we are using (multilib Linux x86_64 hack).
36 + x86_64*|s390x*|powerpc64*|sparc64*)
37 + echo '#line 1281 "ltconfig"' > conftest.$ac_ext
38 + if (eval $ac_compile) && test -s conftest.$objext; then
39 + case `/usr/bin/file conftest.$objext` in
50 + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
51 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"