diff options
| author | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-11-29 20:12:00 +0000 |
|---|---|---|
| committer | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-11-29 20:12:00 +0000 |
| commit | 7206b04b3b0a7f97c8bc57598c86b84d70365ae6 (patch) | |
| tree | 1e745efed2b02f03affb508b1b278e7160165d02 | |
| parent | 004ca39da1a62c5ab5c17ea584010a001bdc40f7 (diff) | |
| download | ppe42-gcc-7206b04b3b0a7f97c8bc57598c86b84d70365ae6.tar.gz ppe42-gcc-7206b04b3b0a7f97c8bc57598c86b84d70365ae6.zip | |
2011-11-29 Andreas Tobler <andreast@fgznet.ch>
* config.rpath (ld_shlibs): Fix detection of FreeBSD-10 and up.
(libname_spec): Likewise.
* configure: Regenerate with autoconf -I ../../.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@181816 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/classpath/ChangeLog.gcj | 6 | ||||
| -rwxr-xr-x | libjava/classpath/config.rpath | 4 | ||||
| -rwxr-xr-x | libjava/classpath/configure | 12 |
3 files changed, 14 insertions, 8 deletions
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index 9eb70ac14e5..0f537912e8c 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,9 @@ +2011-11-29 Andreas Tobler <andreast@fgznet.ch> + + * config.rpath (ld_shlibs): Fix detection of FreeBSD-10 and up. + (libname_spec): Likewise. + * configure: Regenerate with autoconf -I ../../. + 2011-02-13 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * config.rpath, ltcf-c.sh, ltcf-gcj.sh, ltconfig: Remove diff --git a/libjava/classpath/config.rpath b/libjava/classpath/config.rpath index def43dcc5e7..b7f75cde451 100755 --- a/libjava/classpath/config.rpath +++ b/libjava/classpath/config.rpath @@ -361,7 +361,7 @@ else hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes ;; - freebsd2*) + freebsd2.*) hardcode_direct=yes hardcode_minus_L=yes ;; @@ -533,7 +533,7 @@ case "$host_os" in ;; freebsd* | dragonfly*) case "$host_os" in - freebsd[123]*) + freebsd[23].*) library_names_spec='$libname$shrext$versuffix' ;; *) library_names_spec='$libname$shrext' ;; diff --git a/libjava/classpath/configure b/libjava/classpath/configure index 2274f648cf9..a25f5f75a47 100755 --- a/libjava/classpath/configure +++ b/libjava/classpath/configure @@ -10025,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -10941,7 +10941,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -10959,7 +10959,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -14225,7 +14225,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac ;; - freebsd[12]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF ld_shlibs_CXX=no @@ -16000,7 +16000,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -16018,7 +16018,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) |
