diff options
Diffstat (limited to 'libjava/classpath')
| -rw-r--r-- | libjava/classpath/ChangeLog.gcj | 6 | ||||
| -rwxr-xr-x | libjava/classpath/config.rpath | 5 | ||||
| -rwxr-xr-x | libjava/classpath/configure | 24 | ||||
| -rw-r--r-- | libjava/classpath/ltcf-c.sh | 4 | ||||
| -rw-r--r-- | libjava/classpath/ltcf-gcj.sh | 4 | ||||
| -rwxr-xr-x | libjava/classpath/ltconfig | 4 |
6 files changed, 12 insertions, 35 deletions
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 <Ralf.Wildenhues@gmx.de> + + * 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 <aoliva@redhat.com> * 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 |