[kaffe] CVS kaffe (guilhem): Fixlets for netbds.
Kaffe CVS
cvs-commits at kaffe.org
Sun Jul 10 06:54:35 PDT 2005
PatchSet 6720
Date: 2005/07/10 13:49:27
Author: guilhem
Branch: HEAD
Tag: (none)
Log:
Fixlets for netbds.
* configure.ac: Check for sys/ucontext.h
* configure, config/config.h.in,
libltdl/configure: Regenerated.
* config/i386/netbsd1/md.h: Include sys/ucontext.h if available.
* libraries/clib/nio/java_nio_VMDirectByteBuffer.c: Removed
spurious debug message.
Members:
ChangeLog:1.4244->1.4245
configure:1.467->1.468
configure.ac:1.151->1.152
config/config.h.in:1.144->1.145
config/i386/netbsd1/md.h:1.11->1.12
libltdl/configure:1.85->1.86
libraries/clib/nio/java_nio_VMDirectByteBuffer.c:1.9->1.10
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4244 kaffe/ChangeLog:1.4245
--- kaffe/ChangeLog:1.4244 Sun Jul 10 12:01:49 2005
+++ kaffe/ChangeLog Sun Jul 10 13:49:27 2005
@@ -1,3 +1,15 @@
+2005-07-10 Guilhem Lavaux <guilhem at kaffe.org>
+
+ * configure.ac: Check for sys/ucontext.h
+
+ * configure, config/config.h.in,
+ libltdl/configure: Regenerated.
+
+ * config/i386/netbsd1/md.h: Include sys/ucontext.h if available.
+
+ * libraries/clib/nio/java_nio_VMDirectByteBuffer.c: Removed
+ spurious debug message.
+
2005-07-10 Dalibor Topic <robilad at kaffe.org>
Resynced with GNU classpath.
Index: kaffe/configure
diff -u kaffe/configure:1.467 kaffe/configure:1.468
--- kaffe/configure:1.467 Mon Jul 4 15:46:20 2005
+++ kaffe/configure Sun Jul 10 13:49:20 2005
@@ -29828,6 +29828,7 @@
+
for ac_header in stdarg.h \
alloca.h \
bsd/libc.h \
@@ -29870,6 +29871,7 @@
sys/sysctl.h \
sys/param.h \
sys/signal.h \
+sys/ucontext.h \
syslog.h \
time.h \
unistd.h \
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.151 kaffe/configure.ac:1.152
--- kaffe/configure.ac:1.151 Mon Jul 4 15:46:31 2005
+++ kaffe/configure.ac Sun Jul 10 13:49:26 2005
@@ -1045,6 +1045,7 @@
sys/sysctl.h \
sys/param.h \
sys/signal.h \
+sys/ucontext.h \
syslog.h \
time.h \
unistd.h \
Index: kaffe/config/config.h.in
diff -u kaffe/config/config.h.in:1.144 kaffe/config/config.h.in:1.145
--- kaffe/config/config.h.in:1.144 Wed Jun 15 09:56:29 2005
+++ kaffe/config/config.h.in Sun Jul 10 13:49:34 2005
@@ -619,6 +619,9 @@
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
+/* Define to 1 if you have the <sys/ucontext.h> header file. */
+#undef HAVE_SYS_UCONTEXT_H
+
/* Define to 1 if you have the <sys/utsname.h> header file. */
#undef HAVE_SYS_UTSNAME_H
Index: kaffe/config/i386/netbsd1/md.h
diff -u kaffe/config/i386/netbsd1/md.h:1.11 kaffe/config/i386/netbsd1/md.h:1.12
--- kaffe/config/i386/netbsd1/md.h:1.11 Mon Jul 4 00:53:16 2005
+++ kaffe/config/i386/netbsd1/md.h Sun Jul 10 13:49:34 2005
@@ -32,7 +32,9 @@
#endif
+#if defined(HAVE_SYS_UCONTEXT_H)
#include <sys/ucontext.h>
+#endif
/* older netbsd's could have this macro missing, so we provide it */
#ifdef _UC_MACHINE_SP
Index: kaffe/libltdl/configure
diff -u kaffe/libltdl/configure:1.85 kaffe/libltdl/configure:1.86
--- kaffe/libltdl/configure:1.85 Wed Jul 6 23:19:55 2005
+++ kaffe/libltdl/configure Sun Jul 10 13:49:32 2005
@@ -7330,11 +7330,12 @@
tmp_addflag=
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec=
+ whole_archive_flag_spec='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
;;
pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec=
- tmp_addflag=' -fpic -Mnomain' ;;
+ whole_archive_flag_spec='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
@@ -8498,7 +8499,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -8563,8 +8564,8 @@
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -9354,7 +9355,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9357 "configure"
+#line 9358 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9452,7 +9453,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9455 "configure"
+#line 9456 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10950,12 +10951,12 @@
;;
pgCC*)
# Portland Group C++ compiler
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- whole_archive_flag_spec_CXX=''
+ whole_archive_flag_spec_CXX='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
;;
cxx*)
# Compaq C++
@@ -11704,11 +11705,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11707: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11708: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11711: \$? = $ac_status" >&5
+ echo "$as_me:11712: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11766,11 +11767,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11769: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11770: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11773: \$? = $ac_status" >&5
+ echo "$as_me:11774: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12279,7 +12280,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -12344,8 +12345,8 @@
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -13135,7 +13136,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 13138 "configure"
+#line 13139 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13233,7 +13234,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 13236 "configure"
+#line 13237 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14118,11 +14119,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14121: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14122: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14125: \$? = $ac_status" >&5
+ echo "$as_me:14126: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14180,11 +14181,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14183: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14184: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14187: \$? = $ac_status" >&5
+ echo "$as_me:14188: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14395,11 +14396,12 @@
tmp_addflag=
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec_F77=
+ whole_archive_flag_spec_F77='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
;;
pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec_F77=
- tmp_addflag=' -fpic -Mnomain' ;;
+ whole_archive_flag_spec_F77='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
@@ -15543,7 +15545,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -15608,8 +15610,8 @@
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -16305,11 +16307,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16308: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16310: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16312: \$? = $ac_status" >&5
+ echo "$as_me:16314: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16567,11 +16569,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16570: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16572: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16574: \$? = $ac_status" >&5
+ echo "$as_me:16576: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16629,11 +16631,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16632: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16634: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16636: \$? = $ac_status" >&5
+ echo "$as_me:16638: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16844,11 +16846,12 @@
tmp_addflag=
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec_GCJ=
+ whole_archive_flag_spec_GCJ='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
;;
pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec_GCJ=
- tmp_addflag=' -fpic -Mnomain' ;;
+ whole_archive_flag_spec_GCJ='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
@@ -18012,7 +18015,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -18077,8 +18080,8 @@
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -18868,7 +18871,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18871 "configure"
+#line 18874 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18966,7 +18969,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18969 "configure"
+#line 18972 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -21232,7 +21235,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 21235 "configure"
+#line 21238 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
Index: kaffe/libraries/clib/nio/java_nio_VMDirectByteBuffer.c
diff -u kaffe/libraries/clib/nio/java_nio_VMDirectByteBuffer.c:1.9 kaffe/libraries/clib/nio/java_nio_VMDirectByteBuffer.c:1.10
--- kaffe/libraries/clib/nio/java_nio_VMDirectByteBuffer.c:1.9 Mon Jul 4 00:04:09 2005
+++ kaffe/libraries/clib/nio/java_nio_VMDirectByteBuffer.c Sun Jul 10 13:49:35 2005
@@ -175,7 +175,6 @@
(JNIEnv *env, jclass clazz __attribute__ ((__unused__)),
jobject address, jint index)
{
- printf("address is %p, index is %d\n", address, index);
return ((jbyte *) NIOGetPointer (env, address))[index];
}
More information about the kaffe
mailing list