diff options
| author | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-02-13 11:45:53 +0000 |
|---|---|---|
| committer | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-02-13 11:45:53 +0000 |
| commit | 4b20b68c523a41c9101fd67fa2486900c2c48809 (patch) | |
| tree | b1a72daa25241b2ce7c926a5ae6d58b8343992b3 /libjava/libltdl | |
| parent | 2cd4468fd0245bb549a7cd8167693e8b6e75230b (diff) | |
Remove freebsd1 from libtool.m4 macros and config.rpath.
/:
Import from Libtool and gnulib:
2011-01-27 Gerald Pfeifer <gerald@pfeifer.com>
Prepare for supporting FreeBSD 10.
* config.rpath: Remove handling of freebsd1* which soon would
match FreeBSD 10.0.
2011-01-20 Gerald Pfeifer <gerald@pfeifer.com> (tiny change)
Remove support for FreeBSD 1.x.
* libtool.m4 (_LT_LINKER_SHLIBS)
(_LT_SYS_DYNAMIC_LINKER): Remove handling of freebsd1* which
soon would incorrectly match FreeBSD 10.0.
boehm-gc/:
* configure: Regenerate.
gcc/:
* configure: Regenerate.
libffi/:
* configure: Regenerate.
libgfortran/:
* Makefile.in: Regenerate.
* aclocal.m4: Likewise.
* configure: Likewise.
libgo/:
* config/libtool.m4: (_LT_LINKER_SHLIBS)
(_LT_SYS_DYNAMIC_LINKER): Remove handling of freebsd1* which
soon would incorrectly match FreeBSD 10.0.
* configure: Regenerate.
libgomp/:
* configure: Regenerate.
libjava/:
* configure: Regenerate.
* shlibpath.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER): Remove handling
of freebsd1* which soon would incorrectly match FreeBSD 10.0.
libjava/classpath/:
* config.rpath, ltcf-c.sh, ltcf-gcj.sh, ltconfig: Remove
handling of freebsd1* which soon would match FreeBSD 10.0.
* configure: Regenerate.
libjava/libltdl/:
* 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.
libmudflap/:
* configure: Regenerate.
libobjc/:
* configure: Regenerate.
libquadmath/:
* Makefile.in: Regenerate.
* aclocal.m4: Likewise.
* configure: Likewise.
libssp/:
* Makefile.in: Regenerate.
* aclocal.m4: Likewise.
* configure: Likewise.
libstdc++-v3/:
* configure: Regenerate.
lto-plugin/:
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* configure: Regenerate.
zlib/:
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@170106 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/libltdl')
| -rw-r--r-- | libjava/libltdl/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/libltdl/acinclude.m4 | 8 | ||||
| -rwxr-xr-x | libjava/libltdl/configure | 16 |
3 files changed, 11 insertions, 20 deletions
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 <Ralf.Wildenhues@gmx.de> + + * 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 <Ralf.Wildenhues@gmx.de> 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 <<EOF -#line 8663 "configure" +#line 8655 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -8758,7 +8750,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8761 "configure" +#line 8753 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10599,7 +10591,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10602 "configure" +#line 10594 "configure" #include "confdefs.h" #if HAVE_DLFCN_H |