diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 17 | ||||
| -rwxr-xr-x | libjava/configure | 24 | ||||
| -rw-r--r-- | libjava/configure.ac | 16 | ||||
| -rw-r--r-- | libjava/configure.host | 4 | ||||
| -rw-r--r-- | libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc | 5 | ||||
| -rw-r--r-- | libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc | 5 | ||||
| -rw-r--r-- | libjava/gnu/java/net/natPlainSocketImplPosix.cc | 5 | ||||
| -rw-r--r-- | libjava/include/config.h.in | 3 | ||||
| -rw-r--r-- | libjava/include/posix-signal.h | 2 |
9 files changed, 24 insertions, 57 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 989d770..5ccdf14 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,20 @@ +2012-03-14 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * configure.ac (libgcj_cv_exidx): Remove IRIX 6 ld workaround. + (mips-sgi-irix6*): Remove. + (mips-sgi-irix*): Remove. + (AC_CHECK_HEADERS): Remove bstring.h. + * configure: Regenerate. + * include/config.h.in: Regenerate. + * configure.host (mips-sgi-irix6*): Remove. + + * include/posix-signal.h [__sgi__]: Remove. + + * gnu/java/net/natPlainDatagramSocketImplPosix.cc + [HAVE_BSTRING_H]: Remove. + * gnu/java/net/natPlainDatagramSocketImplWin32.cc: Likewise. + * gnu/java/net/natPlainSocketImplPosix.cc: Likewise. + 2012-03-12 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * configure.ac (alpha*-dec-osf*): Remove. diff --git a/libjava/configure b/libjava/configure index 2d80c80..a6d4f28 100755 --- a/libjava/configure +++ b/libjava/configure @@ -599,7 +599,6 @@ ac_includes_default="\ #endif" enable_option_checking=no -ac_c_werror_flag= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -13359,7 +13358,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13362 "configure" +#line 13361 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13465,7 +13464,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13468 "configure" +#line 13467 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19458,7 +19457,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : enableval=$enable_sjlj_exceptions; : else cat > conftest.$ac_ext << EOF -#line 19461 "configure" +#line 19460 "configure" struct S { ~S(); }; void bar(); void foo() @@ -20576,14 +20575,6 @@ if test "${libgcj_cv_exidx+set}" = set; then : else saved_ldflags="$LDFLAGS" LDFLAGS="${LDFLAGS} -Wl,--no-merge-exidx-entries" - # The IRIX 6 ld doesn't recognize --no-merge-exidx-entries, but only - # warns about unknown options, which breaks the testsuite. So enable - # AC_LANG_WERROR, but there's currently (autoconf 2.64) no way to turn - # it off again. As a workaround, save and restore werror flag like - # AC_PATH_XTRA. - ac_xsave_c_werror_flag=$ac_c_werror_flag - -ac_c_werror_flag=yes if test x$gcc_no_link = xyes; then as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 fi @@ -20598,7 +20589,6 @@ else fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - ac_c_werror_flag=$ac_xsave_c_werror_flag LDFLAGS="${saved_ldflags}" fi @@ -23146,10 +23136,6 @@ fi # requires -ldl. if test "$GC" = boehm; then case "${host}" in - mips-sgi-irix6*) - # While IRIX 6 has libdl for the O32 and N32 ABIs, the N64 one is - # missing. It's unnecessary anyway since dlopen lives in libc. - ;; *-*-darwin*) ;; *) @@ -23883,7 +23869,7 @@ esac # BSD_COMP is defined; just including sys/filio.h is simpler. # We avoid AC_HEADER_DIRENT since we really only care about dirent.h # for now. If you change this, you also must update natFile.cc. -for ac_header in unistd.h bstring.h sys/time.h sys/types.h fcntl.h \ +for ac_header in unistd.h sys/time.h sys/types.h fcntl.h \ sys/ioctl.h sys/filio.h sys/stat.h sys/select.h \ sys/socket.h netinet/in.h arpa/inet.h netdb.h \ pwd.h sys/config.h stdint.h langinfo.h locale.h \ @@ -24220,7 +24206,7 @@ SYSDEP_SOURCES= SIGNAL_HANDLER_AUX= case "${host}" in - mips-sgi-irix* | *-*-solaris2*) + *-*-solaris2*) SIGNAL_HANDLER=include/posix-signal.h ;; i?86-*-linux*) diff --git a/libjava/configure.ac b/libjava/configure.ac index 434f923..488d0fa 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -961,17 +961,9 @@ esac AC_CACHE_CHECK([for --no-merge-exidx-entries], [libgcj_cv_exidx], [saved_ldflags="$LDFLAGS" LDFLAGS="${LDFLAGS} -Wl,--no-merge-exidx-entries" - # The IRIX 6 ld doesn't recognize --no-merge-exidx-entries, but only - # warns about unknown options, which breaks the testsuite. So enable - # AC_LANG_WERROR, but there's currently (autoconf 2.64) no way to turn - # it off again. As a workaround, save and restore werror flag like - # AC_PATH_XTRA. - ac_xsave_[]_AC_LANG_ABBREV[]_werror_flag=$ac_[]_AC_LANG_ABBREV[]_werror_flag - AC_LANG_WERROR AC_LINK_IFELSE([int main(void){ return 0;} ], [eval "libgcj_cv_exidx=yes"], [eval "libgcj_cv_exidx=no"]) - ac_[]_AC_LANG_ABBREV[]_werror_flag=$ac_xsave_[]_AC_LANG_ABBREV[]_werror_flag LDFLAGS="${saved_ldflags}"] ) if test "${libgcj_cv_exidx}" = "yes"; then @@ -1481,10 +1473,6 @@ else # requires -ldl. if test "$GC" = boehm; then case "${host}" in - mips-sgi-irix6*) - # While IRIX 6 has libdl for the O32 and N32 ABIs, the N64 one is - # missing. It's unnecessary anyway since dlopen lives in libc. - ;; *-*-darwin*) ;; *) @@ -1636,7 +1624,7 @@ TL_AC_GXX_INCLUDE_DIR # BSD_COMP is defined; just including sys/filio.h is simpler. # We avoid AC_HEADER_DIRENT since we really only care about dirent.h # for now. If you change this, you also must update natFile.cc. -AC_CHECK_HEADERS([unistd.h bstring.h sys/time.h sys/types.h fcntl.h \ +AC_CHECK_HEADERS([unistd.h sys/time.h sys/types.h fcntl.h \ sys/ioctl.h sys/filio.h sys/stat.h sys/select.h \ sys/socket.h netinet/in.h arpa/inet.h netdb.h \ pwd.h sys/config.h stdint.h langinfo.h locale.h \ @@ -1732,7 +1720,7 @@ SYSDEP_SOURCES= SIGNAL_HANDLER_AUX= case "${host}" in - mips-sgi-irix* | *-*-solaris2*) + *-*-solaris2*) SIGNAL_HANDLER=include/posix-signal.h ;; i?86-*-linux*) diff --git a/libjava/configure.host b/libjava/configure.host index 8ce7044..0c3b41c 100644 --- a/libjava/configure.host +++ b/libjava/configure.host @@ -289,10 +289,6 @@ EOF sysdeps_dir=i386 DIVIDESPEC=-f%{m32:no-}use-divide-subroutine ;; - mips-sgi-irix6* ) - can_unwind_signal=yes - sysdeps_dir=mips - ;; arm*-linux* ) slow_pthread_self=no can_unwind_signal=no diff --git a/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc b/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc index 65a42f9..edec051 100644 --- a/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc +++ b/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc @@ -18,11 +18,6 @@ details. */ #include <errno.h> #include <string.h> -#if HAVE_BSTRING_H -// Needed for bzero, implicitly used by FD_ZERO on IRIX 5.2 -#include <bstring.h> -#endif - #include <gcj/cni.h> #include <gnu/java/net/PlainDatagramSocketImpl.h> #include <java/io/IOException.h> diff --git a/libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc b/libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc index 8d83720..d659b0b 100644 --- a/libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc +++ b/libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc @@ -10,11 +10,6 @@ details. */ #include <platform.h> #include <string.h> -#if HAVE_BSTRING_H -// Needed for bzero, implicitly used by FD_ZERO on IRIX 5.2 -#include <bstring.h> -#endif - #include <gnu/java/net/PlainDatagramSocketImpl.h> #include <java/io/IOException.h> #include <java/net/BindException.h> diff --git a/libjava/gnu/java/net/natPlainSocketImplPosix.cc b/libjava/gnu/java/net/natPlainSocketImplPosix.cc index dabf6e6..7671cc3 100644 --- a/libjava/gnu/java/net/natPlainSocketImplPosix.cc +++ b/libjava/gnu/java/net/natPlainSocketImplPosix.cc @@ -24,11 +24,6 @@ details. */ #include <errno.h> #include <string.h> -#if HAVE_BSTRING_H -// Needed for bzero, implicitly used by FD_ZERO on IRIX 5.2 -#include <bstring.h> -#endif - #include <gcj/cni.h> #include <gcj/javaprims.h> #include <gnu/java/net/PlainSocketImpl.h> diff --git a/libjava/include/config.h.in b/libjava/include/config.h.in index ce6b748..8e718ac 100644 --- a/libjava/include/config.h.in +++ b/libjava/include/config.h.in @@ -43,9 +43,6 @@ /* Define if you have u_int32_t */ #undef HAVE_BSD_INT32_DEFINED -/* Define to 1 if you have the <bstring.h> header file. */ -#undef HAVE_BSTRING_H - /* Define to 1 if the target assembler supports thread-local storage. */ #undef HAVE_CC_TLS diff --git a/libjava/include/posix-signal.h b/libjava/include/posix-signal.h index 7be37f5..a0f96a9 100644 --- a/libjava/include/posix-signal.h +++ b/libjava/include/posix-signal.h @@ -22,8 +22,6 @@ details. */ #if defined __sun__ && defined __svr4__ #define SA_FLAGS SA_NODEFER | SA_SIGINFO -#elif defined __sgi__ -#define SA_FLAGS SA_NODEFER #else #error Must define SA_FLAGS. #endif |