[kaffe] CVS kaffe (robilad): Fixed cross-compilation problems with binreloc configure tests
Kaffe CVS
cvs-commits at kaffe.org
Mon Jan 30 18:39:29 PST 2006
PatchSet 7110
Date: 2006/01/31 02:27:12
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Fixed cross-compilation problems with binreloc configure tests
2006-01-30 Dalibor Topic <robilad at kaffe.org>
Fixed bug #2.
* config/alpha/linux/config.frag,
config/alpha/netbsd1/config.frag,
config/arm/linux/config.frag,
config/arm/netbsd1/config.frag,
config/arm/riscos/config.frag,
config/i386/linux/config.frag,
config/i386/netbsd1/config.frag,
config/ia64/linux/config.frag,
config/m68k/linux/config.frag,
config/m68k/netbsd1/config.frag,
config/m68k/sunos4/config.frag,
config/mips/linux/config.frag,
config/mips/netbsd1/config.frag,
config/parisc/linux/config.frag,
config/powerpc/linux/config.frag,
config/powerpc/netbsd1/config.frag,
config/s390/linux/config.frag,
config/sh/linux/config.frag,
config/sparc/linux/config.frag,
config/sparc/netbsd1/config.frag,
config/x86_64/linux/config.frag:
Reverted Kiyo's patch from 2006-01-19 as it is no longer necessary.
* configure.ac: When cross-compiling, don't test for /proc/self/maps.
Warn users to explicitely enable binreloc if they need it.
Members:
ChangeLog:1.4628->1.4629
configure:1.531->1.532
configure.ac:1.209->1.210
config/alpha/linux/config.frag:1.6->1.7
config/alpha/netbsd1/config.frag:1.6->1.7
config/arm/linux/config.frag:1.9->1.10
config/arm/netbsd1/config.frag:1.7->1.8
config/arm/riscos/config.frag:1.2->1.3
config/i386/linux/config.frag:1.7->1.8
config/i386/netbsd1/config.frag:1.5->1.6
config/ia64/linux/config.frag:1.4->1.5
config/m68k/linux/config.frag:1.7->1.8
config/m68k/netbsd1/config.frag:1.10->1.11
config/m68k/sunos4/config.frag:1.6->1.7
config/mips/linux/config.frag:1.5->1.6
config/mips/netbsd1/config.frag:1.5->1.6
config/parisc/linux/config.frag:1.3->1.4
config/powerpc/linux/config.frag:1.8->1.9
config/powerpc/netbsd1/config.frag:1.5->1.6
config/s390/linux/config.frag:1.3->1.4
config/sh/linux/config.frag:1.2->1.3
config/sparc/linux/config.frag:1.5->1.6
config/sparc/netbsd1/config.frag:1.5->1.6
config/x86_64/linux/config.frag:1.3->1.4
libraries/javalib/external/classpath/config.sub:1.22->1.23
libraries/javalib/external/classpath/doc/vmintegration.info:1.6->1.7
scripts/ltmain.sh:1.19->1.20
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4628 kaffe/ChangeLog:1.4629
--- kaffe/ChangeLog:1.4628 Sun Jan 29 19:18:17 2006
+++ kaffe/ChangeLog Tue Jan 31 02:27:12 2006
@@ -1,3 +1,33 @@
+2006-01-30 Dalibor Topic <robilad at kaffe.org>
+
+ Fixed bug #2.
+
+ * config/alpha/linux/config.frag,
+ config/alpha/netbsd1/config.frag,
+ config/arm/linux/config.frag,
+ config/arm/netbsd1/config.frag,
+ config/arm/riscos/config.frag,
+ config/i386/linux/config.frag,
+ config/i386/netbsd1/config.frag,
+ config/ia64/linux/config.frag,
+ config/m68k/linux/config.frag,
+ config/m68k/netbsd1/config.frag,
+ config/m68k/sunos4/config.frag,
+ config/mips/linux/config.frag,
+ config/mips/netbsd1/config.frag,
+ config/parisc/linux/config.frag,
+ config/powerpc/linux/config.frag,
+ config/powerpc/netbsd1/config.frag,
+ config/s390/linux/config.frag,
+ config/sh/linux/config.frag,
+ config/sparc/linux/config.frag,
+ config/sparc/netbsd1/config.frag,
+ config/x86_64/linux/config.frag:
+ Reverted Kiyo's patch from 2006-01-19 as it is no longer necessary.
+
+ * configure.ac: When cross-compiling, don't test for /proc/self/maps.
+ Warn users to explicitely enable binreloc if they need it.
+
2006-01-29 Riccardo Mottola <riccardo at kaffe.org>
* libraries/javalib/awt-implementations/kaffe/java/awt/EventQueue.java
Implemented some stuff, adapting from classpath.
Index: kaffe/configure
diff -u kaffe/configure:1.531 kaffe/configure:1.532
--- kaffe/configure:1.531 Sun Jan 22 19:44:02 2006
+++ kaffe/configure Tue Jan 31 02:27:18 2006
@@ -49928,6 +49928,11 @@
done
if test x"$ac_cv_header_pthread_h" = x"yes"; then
+ if test x"$cross_compiling" = x"yes"; then
+ ac_cv_file__proc_self_maps=no;
+ { echo "$as_me:$LINENO: WARNING: If you want binreloc support on the platform you are cross-compiling to, and the platform supports it, please run configure with --enable-binreloc explicitely." >&5
+echo "$as_me: WARNING: If you want binreloc support on the platform you are cross-compiling to, and the platform supports it, please run configure with --enable-binreloc explicitely." >&2;}
+ fi
# Check whether --enable-binreloc or --disable-binreloc was given.
if test "${enable_binreloc+set}" = set; then
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.209 kaffe/configure.ac:1.210
--- kaffe/configure.ac:1.209 Sun Jan 22 19:44:08 2006
+++ kaffe/configure.ac Tue Jan 31 02:27:26 2006
@@ -2269,6 +2269,10 @@
AC_CHECK_HEADERS([pthread.h])
if test x"$ac_cv_header_pthread_h" = x"yes"; then
dnl We can now check whether we want binreloc
+ if test x"$cross_compiling" = x"yes"; then
+ ac_cv_file__proc_self_maps=no;
+ AC_MSG_WARN([If you want binreloc support on the platform you are cross-compiling to, and the platform supports it, please run configure with --enable-binreloc explicitely.])
+ fi
AM_BINRELOC
fi
Index: kaffe/config/alpha/linux/config.frag
diff -u kaffe/config/alpha/linux/config.frag:1.6 kaffe/config/alpha/linux/config.frag:1.7
--- kaffe/config/alpha/linux/config.frag:1.6 Thu Jan 19 00:51:27 2006
+++ kaffe/config/alpha/linux/config.frag Tue Jan 31 02:27:32 2006
@@ -6,5 +6,4 @@
# if we use cross environment, following values may not be detected.
if [ "$cross_compiling" = yes ]; then
ac_cv_c_char_unsigned=${ac_cv_c_char_unsigned='no'}
- ac_cv_file__proc_self_maps=${ac_cv_file__proc_self_maps='yes'}
fi
Index: kaffe/config/alpha/netbsd1/config.frag
diff -u kaffe/config/alpha/netbsd1/config.frag:1.6 kaffe/config/alpha/netbsd1/config.frag:1.7
--- kaffe/config/alpha/netbsd1/config.frag:1.6 Thu Jan 19 00:51:27 2006
+++ kaffe/config/alpha/netbsd1/config.frag Tue Jan 31 02:27:32 2006
@@ -5,5 +5,4 @@
if [ "$cross_compiling" = yes ]; then
ac_cv_c_char_unsigned=${ac_cv_c_char_unsigned='no'}
- ac_cv_file__proc_self_maps=${ac_cv_file__proc_self_maps='yes'}
fi
Index: kaffe/config/arm/linux/config.frag
diff -u kaffe/config/arm/linux/config.frag:1.9 kaffe/config/arm/linux/config.frag:1.10
--- kaffe/config/arm/linux/config.frag:1.9 Thu Jan 19 00:51:27 2006
+++ kaffe/config/arm/linux/config.frag Tue Jan 31 02:27:33 2006
@@ -12,5 +12,4 @@
ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped='yes'}
# ac_cv_func_utime_null=${ac_cv_func_utime_null='yes'}
ac_cv_c_char_unsigned=${ac_cv_c_char_unsigned='no'}
- ac_cv_file__proc_self_maps=${ac_cv_file__proc_self_maps='yes'}
fi
Index: kaffe/config/arm/netbsd1/config.frag
diff -u kaffe/config/arm/netbsd1/config.frag:1.7 kaffe/config/arm/netbsd1/config.frag:1.8
--- kaffe/config/arm/netbsd1/config.frag:1.7 Thu Jan 19 00:51:28 2006
+++ kaffe/config/arm/netbsd1/config.frag Tue Jan 31 02:27:33 2006
@@ -5,5 +5,4 @@
if [ "$cross_compiling" = yes ]; then
ac_cv_c_char_unsigned=${ac_cv_c_char_unsigned='no'}
- ac_cv_file__proc_self_maps=${ac_cv_file__proc_self_maps='yes'}
fi
Index: kaffe/config/arm/riscos/config.frag
diff -u kaffe/config/arm/riscos/config.frag:1.2 kaffe/config/arm/riscos/config.frag:1.3
--- kaffe/config/arm/riscos/config.frag:1.2 Thu Jan 19 00:51:28 2006
+++ kaffe/config/arm/riscos/config.frag Tue Jan 31 02:27:33 2006
@@ -19,5 +19,4 @@
ac_cv_sizeof_short=${ac_cv_sizeof_short='2'}
ac_cv_sizeof_voidp=${ac_cv_sizeof_voidp='4'}
ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped='yes'}
- ac_cv_file__proc_self_maps=${ac_cv_file__proc_self_maps='yes'}
fi
Index: kaffe/config/i386/linux/config.frag
diff -u kaffe/config/i386/linux/config.frag:1.7 kaffe/config/i386/linux/config.frag:1.8
--- kaffe/config/i386/linux/config.frag:1.7 Thu Jan 19 00:51:28 2006
+++ kaffe/config/i386/linux/config.frag Tue Jan 31 02:27:34 2006
@@ -8,5 +8,4 @@
# if we use cross environment, following values may not be detected.
if [ "$cross_compiling" = yes ]; then
ac_cv_c_char_unsigned=${ac_cv_c_char_unsigned='no'}
- ac_cv_file__proc_self_maps=${ac_cv_file__proc_self_maps='yes'}
fi
Index: kaffe/config/i386/netbsd1/config.frag
diff -u kaffe/config/i386/netbsd1/config.frag:1.5 kaffe/config/i386/netbsd1/config.frag:1.6
--- kaffe/config/i386/netbsd1/config.frag:1.5 Thu Jan 19 00:51:29 2006
+++ kaffe/config/i386/netbsd1/config.frag Tue Jan 31 02:27:34 2006
@@ -3,5 +3,4 @@
#
if [ "$cross_compiling" = yes ]; then
ac_cv_c_char_unsigned=${ac_cv_c_char_unsigned='no'}
- ac_cv_file__proc_self_maps=${ac_cv_file__proc_self_maps='yes'}
fi
Index: kaffe/config/ia64/linux/config.frag
diff -u kaffe/config/ia64/linux/config.frag:1.4 kaffe/config/ia64/linux/config.frag:1.5
--- kaffe/config/ia64/linux/config.frag:1.4 Thu Jan 19 00:51:30 2006
+++ kaffe/config/ia64/linux/config.frag Tue Jan 31 02:27:35 2006
@@ -8,7 +8,6 @@
# if we use cross environment, following values may not be detected.
if [ "$cross_compiling" = yes ]; then
ac_cv_c_char_unsigned=${ac_cv_c_char_unsigned='no'}
- ac_cv_file__proc_self_maps=${ac_cv_file__proc_self_maps='yes'}
fi
# work around bug in gcc's optimizer
Index: kaffe/config/m68k/linux/config.frag
diff -u kaffe/config/m68k/linux/config.frag:1.7 kaffe/config/m68k/linux/config.frag:1.8
--- kaffe/config/m68k/linux/config.frag:1.7 Thu Jan 19 00:51:30 2006
+++ kaffe/config/m68k/linux/config.frag Tue Jan 31 02:27:35 2006
@@ -7,5 +7,4 @@
if [ "$cross_compiling" = yes ]; then
ac_cv_alignmentof_voidp=${ac_cv_alignmentof_voidp='2'}
ac_cv_c_char_unsigned=${ac_cv_c_char_unsigned='no'}
- ac_cv_file__proc_self_maps=${ac_cv_file__proc_self_maps='yes'}
fi
Index: kaffe/config/m68k/netbsd1/config.frag
diff -u kaffe/config/m68k/netbsd1/config.frag:1.10 kaffe/config/m68k/netbsd1/config.frag:1.11
--- kaffe/config/m68k/netbsd1/config.frag:1.10 Thu Jan 19 00:51:30 2006
+++ kaffe/config/m68k/netbsd1/config.frag Tue Jan 31 02:27:35 2006
@@ -5,5 +5,4 @@
LDFLAGS="$LDFLAGS -lm68k"
if [ "$cross_compiling" = yes ]; then
ac_cv_c_char_unsigned=${ac_cv_c_char_unsigned='no'}
- ac_cv_file__proc_self_maps=${ac_cv_file__proc_self_maps='yes'}
fi
Index: kaffe/config/m68k/sunos4/config.frag
diff -u kaffe/config/m68k/sunos4/config.frag:1.6 kaffe/config/m68k/sunos4/config.frag:1.7
--- kaffe/config/m68k/sunos4/config.frag:1.6 Thu Jan 19 00:51:31 2006
+++ kaffe/config/m68k/sunos4/config.frag Tue Jan 31 02:27:36 2006
@@ -13,5 +13,4 @@
ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long='8'}
ac_cv_sizeof_short=${ac_cv_sizeof_short='2'}
ac_cv_sizeof_voidp=${ac_cv_sizeof_voidp='4'}
- ac_cv_file__proc_self_maps=${ac_cv_file__proc_self_maps='yes'}
fi
Index: kaffe/config/mips/linux/config.frag
diff -u kaffe/config/mips/linux/config.frag:1.5 kaffe/config/mips/linux/config.frag:1.6
--- kaffe/config/mips/linux/config.frag:1.5 Thu Jan 19 00:51:31 2006
+++ kaffe/config/mips/linux/config.frag Tue Jan 31 02:27:36 2006
@@ -6,5 +6,4 @@
# if we use cross environment, following values may not be detected.
if [ "$cross_compiling" = yes ]; then
ac_cv_c_char_unsigned=${ac_cv_c_char_unsigned='no'}
- ac_cv_file__proc_self_maps=${ac_cv_file__proc_self_maps='yes'}
fi
Index: kaffe/config/mips/netbsd1/config.frag
diff -u kaffe/config/mips/netbsd1/config.frag:1.5 kaffe/config/mips/netbsd1/config.frag:1.6
--- kaffe/config/mips/netbsd1/config.frag:1.5 Thu Jan 19 00:51:31 2006
+++ kaffe/config/mips/netbsd1/config.frag Tue Jan 31 02:27:37 2006
@@ -5,5 +5,4 @@
if [ "$cross_compiling" = yes ]; then
ac_cv_c_char_unsigned=${ac_cv_c_char_unsigned='no'}
- ac_cv_file__proc_self_maps=${ac_cv_file__proc_self_maps='yes'}
fi
Index: kaffe/config/parisc/linux/config.frag
diff -u kaffe/config/parisc/linux/config.frag:1.3 kaffe/config/parisc/linux/config.frag:1.4
--- kaffe/config/parisc/linux/config.frag:1.3 Thu Jan 19 00:51:31 2006
+++ kaffe/config/parisc/linux/config.frag Tue Jan 31 02:27:37 2006
@@ -4,5 +4,4 @@
# if we use cross environment, following values may not be detected.
if [ "$cross_compiling" = yes ]; then
ac_cv_c_char_unsigned=${ac_cv_c_char_unsigned='no'}
- ac_cv_file__proc_self_maps=${ac_cv_file__proc_self_maps='yes'}
fi
Index: kaffe/config/powerpc/linux/config.frag
diff -u kaffe/config/powerpc/linux/config.frag:1.8 kaffe/config/powerpc/linux/config.frag:1.9
--- kaffe/config/powerpc/linux/config.frag:1.8 Thu Jan 19 00:51:32 2006
+++ kaffe/config/powerpc/linux/config.frag Tue Jan 31 02:27:38 2006
@@ -6,5 +6,4 @@
# if we use cross environment, following values may not be detected.
if [ "$cross_compiling" = yes ]; then
ac_cv_c_char_unsigned=${ac_cv_c_char_unsigned='no'}
- ac_cv_file__proc_self_maps=${ac_cv_file__proc_self_maps='yes'}
fi
Index: kaffe/config/powerpc/netbsd1/config.frag
diff -u kaffe/config/powerpc/netbsd1/config.frag:1.5 kaffe/config/powerpc/netbsd1/config.frag:1.6
--- kaffe/config/powerpc/netbsd1/config.frag:1.5 Thu Jan 19 00:51:32 2006
+++ kaffe/config/powerpc/netbsd1/config.frag Tue Jan 31 02:27:38 2006
@@ -5,7 +5,6 @@
if [ "$cross_compiling" = yes ]; then
ac_cv_c_char_unsigned=${ac_cv_c_char_unsigned='no'}
- ac_cv_file__proc_self_maps=${ac_cv_file__proc_self_maps='yes'}
fi
if test "$with_setjmp" = "glibc"; then
Index: kaffe/config/s390/linux/config.frag
diff -u kaffe/config/s390/linux/config.frag:1.3 kaffe/config/s390/linux/config.frag:1.4
--- kaffe/config/s390/linux/config.frag:1.3 Thu Jan 19 00:51:33 2006
+++ kaffe/config/s390/linux/config.frag Tue Jan 31 02:27:39 2006
@@ -8,5 +8,4 @@
# if we use cross environment, following values may not be detected.
if [ "$cross_compiling" = yes ]; then
ac_cv_c_char_unsigned=${ac_cv_c_char_unsigned='no'}
- ac_cv_file__proc_self_maps=${ac_cv_file__proc_self_maps='yes'}
fi
Index: kaffe/config/sh/linux/config.frag
diff -u kaffe/config/sh/linux/config.frag:1.2 kaffe/config/sh/linux/config.frag:1.3
--- kaffe/config/sh/linux/config.frag:1.2 Thu Jan 19 00:51:33 2006
+++ kaffe/config/sh/linux/config.frag Tue Jan 31 02:27:40 2006
@@ -16,7 +16,6 @@
ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long='8'}
ac_cv_sizeof_short=${ac_cv_sizeof_short='2'}
ac_cv_sizeof_voidp=${ac_cv_sizeof_voidp='4'}
- ac_cv_file__proc_self_maps=${ac_cv_file__proc_self_maps='yes'}
# Endian can be set by check the name of compiler, ugly?
if [ "$CC" = 'sh3eb-linux-gcc' ]; then
ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
Index: kaffe/config/sparc/linux/config.frag
diff -u kaffe/config/sparc/linux/config.frag:1.5 kaffe/config/sparc/linux/config.frag:1.6
--- kaffe/config/sparc/linux/config.frag:1.5 Thu Jan 19 00:51:33 2006
+++ kaffe/config/sparc/linux/config.frag Tue Jan 31 02:27:40 2006
@@ -4,5 +4,4 @@
# if we use cross environment, following values may not be detected.
if [ "$cross_compiling" = yes ]; then
ac_cv_c_char_unsigned=${ac_cv_c_char_unsigned='no'}
- ac_cv_file__proc_self_maps=${ac_cv_file__proc_self_maps='yes'}
fi
Index: kaffe/config/sparc/netbsd1/config.frag
diff -u kaffe/config/sparc/netbsd1/config.frag:1.5 kaffe/config/sparc/netbsd1/config.frag:1.6
--- kaffe/config/sparc/netbsd1/config.frag:1.5 Thu Jan 19 00:51:33 2006
+++ kaffe/config/sparc/netbsd1/config.frag Tue Jan 31 02:27:41 2006
@@ -3,5 +3,4 @@
#
if [ "$cross_compiling" = yes ]; then
ac_cv_c_char_unsigned=${ac_cv_c_char_unsigned='no'}
- ac_cv_file__proc_self_maps=${ac_cv_file__proc_self_maps='yes'}
fi
Index: kaffe/config/x86_64/linux/config.frag
diff -u kaffe/config/x86_64/linux/config.frag:1.3 kaffe/config/x86_64/linux/config.frag:1.4
--- kaffe/config/x86_64/linux/config.frag:1.3 Thu Jan 19 00:51:34 2006
+++ kaffe/config/x86_64/linux/config.frag Tue Jan 31 02:27:41 2006
@@ -8,5 +8,4 @@
# if we use cross environment, following values may not be detected.
if [ "$cross_compiling" = yes ]; then
ac_cv_c_char_unsigned=${ac_cv_c_char_unsigned='no'}
- ac_cv_file__proc_self_maps=${ac_cv_file__proc_self_maps='yes'}
fi
Index: kaffe/libraries/javalib/external/classpath/config.sub
diff -u kaffe/libraries/javalib/external/classpath/config.sub:1.22 kaffe/libraries/javalib/external/classpath/config.sub:1.23
--- kaffe/libraries/javalib/external/classpath/config.sub:1.22 Fri Jan 27 22:07:02 2006
+++ kaffe/libraries/javalib/external/classpath/config.sub Tue Jan 31 02:27:42 2006
@@ -1335,6 +1335,9 @@
-kaos*)
os=-kaos
;;
+ -*drops)
+ os=-drops
+ ;;
-zvmoe)
os=-zvmoe
;;
Index: kaffe/libraries/javalib/external/classpath/doc/vmintegration.info
diff -u kaffe/libraries/javalib/external/classpath/doc/vmintegration.info:1.6 kaffe/libraries/javalib/external/classpath/doc/vmintegration.info:1.7
--- kaffe/libraries/javalib/external/classpath/doc/vmintegration.info:1.6 Fri Jan 27 22:07:08 2006
+++ kaffe/libraries/javalib/external/classpath/doc/vmintegration.info Tue Jan 31 02:27:42 2006
@@ -1,5 +1,7 @@
-This is ../../classpath/doc/vmintegration.info, produced by makeinfo
-version 4.8 from ../../classpath/doc/vmintegration.texinfo.
+This is
+../../../../../../kaffe/libraries/javalib/external/classpath/doc/vmintegration.info,
+produced by makeinfo version 4.7 from
+../../../../../../kaffe/libraries/javalib/external/classpath/doc/vmintegration.texinfo.
This file contains important information you will need to know if you
are going to write an interface between GNU Classpath and a Virtual
@@ -1500,52 +1502,52 @@
Tag Table:
-Node: Top496
-Node: Introduction1227
-Node: Initialization5801
-Node: Classpath Hooks6214
-Node: java.lang7434
-Node: java.lang.VMClass8136
-Node: java.lang.VMObject12406
-Node: java.lang.VMClassLoader14019
-Node: java.lang.VMSystem16871
-Node: java.lang.VMThrowable19498
-Node: java.lang.VMCompiler20518
-Node: java.lang.VMDouble21497
-Node: java.lang.VMFloat22762
-Node: java.lang.VMProcess23458
-Node: java.lang.VMRuntime24840
-Node: java.lang.VMString27403
-Node: java.lang.VMThread28223
-Node: java.lang.VMInstrumentationImpl31710
-Node: gnu.classpath34028
-Node: gnu.classpath.VMStackWalker34468
-Node: gnu.classpath.VMSystemProperties35534
-Node: java.util36867
-Node: java.util.VMTimeZone37330
-Node: java.io38246
-Node: java.io.VMFile38975
-Node: java.io.VMObjectInputStream41846
-Node: java.io.VMObjectStreamClass42527
-Node: java.security43357
-Node: java.security.VMAccessController43698
-Node: java.net44862
-Node: java.net.VMInetAddress45303
-Node: java.net.VMNetworkInterface46096
-Node: java.nio46528
-Node: java.nio.VMDirectByteBuffer47031
-Node: java.nio.channels48479
-Node: java.nio.channels.VMChannels48896
-Node: gnu.java.nio49664
-Node: gnu.java.nio.VMPipe50080
-Node: gnu.java.nio.VMSelector50597
-Node: Classpath Callbacks51143
-Node: VM Hooks51623
-Node: JNI Implementation55822
-Node: Miscellaneous VM Requirements57693
-Node: JNI Version58002
-Node: VM Threading Model58562
-Ref: VM Threading Model-Footnote-160178
-Node: Boot Library Path Property60290
+Node: Top586
+Node: Introduction1317
+Node: Initialization5891
+Node: Classpath Hooks6304
+Node: java.lang7524
+Node: java.lang.VMClass8226
+Node: java.lang.VMObject12496
+Node: java.lang.VMClassLoader14109
+Node: java.lang.VMSystem16961
+Node: java.lang.VMThrowable19588
+Node: java.lang.VMCompiler20608
+Node: java.lang.VMDouble21587
+Node: java.lang.VMFloat22852
+Node: java.lang.VMProcess23548
+Node: java.lang.VMRuntime24930
+Node: java.lang.VMString27493
+Node: java.lang.VMThread28313
+Node: java.lang.VMInstrumentationImpl31800
+Node: gnu.classpath34118
+Node: gnu.classpath.VMStackWalker34558
+Node: gnu.classpath.VMSystemProperties35624
+Node: java.util36957
+Node: java.util.VMTimeZone37420
+Node: java.io38336
+Node: java.io.VMFile39065
+Node: java.io.VMObjectInputStream41936
+Node: java.io.VMObjectStreamClass42617
+Node: java.security43447
+Node: java.security.VMAccessController43788
+Node: java.net44952
+Node: java.net.VMInetAddress45393
+Node: java.net.VMNetworkInterface46186
+Node: java.nio46618
+Node: java.nio.VMDirectByteBuffer47121
+Node: java.nio.channels48569
+Node: java.nio.channels.VMChannels48986
+Node: gnu.java.nio49754
+Node: gnu.java.nio.VMPipe50170
+Node: gnu.java.nio.VMSelector50687
+Node: Classpath Callbacks51233
+Node: VM Hooks51713
+Node: JNI Implementation55912
+Node: Miscellaneous VM Requirements57783
+Node: JNI Version58092
+Node: VM Threading Model58652
+Ref: VM Threading Model-Footnote-160268
+Node: Boot Library Path Property60380
End Tag Table
Index: kaffe/scripts/ltmain.sh
diff -u kaffe/scripts/ltmain.sh:1.19 kaffe/scripts/ltmain.sh:1.20
--- kaffe/scripts/ltmain.sh:1.19 Sun Jan 22 19:44:57 2006
+++ kaffe/scripts/ltmain.sh Tue Jan 31 02:27:43 2006
@@ -1,7 +1,7 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
#
@@ -17,7 +17,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -43,9 +43,14 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=1.5.6
-TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 224 $"
+VERSION=1.5.22
+TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes.
+if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+fi
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
@@ -83,14 +88,15 @@
Xsed="${SED}"' -e 1s/^X//'
sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
# test EBCDIC or ASCII
-case `echo A|tr A '\301'` in
- A) # EBCDIC based system
- SP2NL="tr '\100' '\n'"
- NL2SP="tr '\r\n' '\100\100'"
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+ SP2NL='tr \040 \012'
+ NL2SP='tr \015\012 \040\040'
;;
- *) # Assume ASCII based system
- SP2NL="tr '\040' '\012'"
- NL2SP="tr '\015\012' '\040\040'"
+ *) # EBCDIC based system
+ SP2NL='tr \100 \n'
+ NL2SP='tr \r\n \100\100'
;;
esac
@@ -107,8 +113,9 @@
fi
# Make sure IFS has a sensible default
-: ${IFS="
-"}
+lt_nl='
+'
+IFS=" $lt_nl"
if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
$echo "$modename: not configured to build any kind of library" 1>&2
@@ -125,6 +132,8 @@
show="$echo"
show_help=
execute_dlfiles=
+duplicate_deps=no
+preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
@@ -132,13 +141,51 @@
# Shell function definitions:
# This seems to be the best place for them
+# func_mktempdir [string]
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible. If
+# given, STRING is the basename for that directory.
+func_mktempdir ()
+{
+ my_template="${TMPDIR-/tmp}/${1-$progname}"
+
+ if test "$run" = ":"; then
+ # Return a directory name, but don't create it in dry-run mode
+ my_tmpdir="${my_template}-$$"
+ else
+
+ # If mktemp works, use that first and foremost
+ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+
+ if test ! -d "$my_tmpdir"; then
+ # Failing that, at least try and use $RANDOM to avoid a race
+ my_tmpdir="${my_template}-${RANDOM-0}$$"
+
+ save_mktempdir_umask=`umask`
+ umask 0077
+ $mkdir "$my_tmpdir"
+ umask $save_mktempdir_umask
+ fi
+
+ # If we're not in dry-run mode, bomb out on failure
+ test -d "$my_tmpdir" || {
+ $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
+ exit $EXIT_FAILURE
+ }
+ fi
+
+ $echo "X$my_tmpdir" | $Xsed
+}
+
+
# func_win32_libid arg
# return the library type of file 'arg'
#
# Need a lot of goo to handle *both* DLLs and import libs
# Has to be a shell function in order to 'eat' the argument
# that is supplied when $file_magic_command is called.
-func_win32_libid () {
+func_win32_libid ()
+{
win32_libid_type="unknown"
win32_fileres=`file -L $1 2>/dev/null`
case $win32_fileres in
@@ -149,12 +196,11 @@
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
$EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
win32_nmres=`eval $NM -f posix -A $1 | \
- sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
- if test "X$win32_nmres" = "Ximport" ; then
- win32_libid_type="x86 archive import"
- else
- win32_libid_type="x86 archive static"
- fi
+ $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
+ case $win32_nmres in
+ import*) win32_libid_type="x86 archive import";;
+ *) win32_libid_type="x86 archive static";;
+ esac
fi
;;
*DLL*)
@@ -178,7 +224,8 @@
# Only attempt this if the compiler in the base compile
# command doesn't match the default compiler.
# arg is usually of the form 'gcc ...'
-func_infer_tag () {
+func_infer_tag ()
+{
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
@@ -235,12 +282,116 @@
esac
fi
}
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+ f_ex_an_ar_dir="$1"; shift
+ f_ex_an_ar_oldlib="$1"
+
+ $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
+ $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
+ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+ :
+ else
+ $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
+ exit $EXIT_FAILURE
+ fi
+}
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+ my_gentop="$1"; shift
+ my_oldlibs=${1+"$@"}
+ my_oldobjs=""
+ my_xlib=""
+ my_xabs=""
+ my_xdir=""
+ my_status=""
+
+ $show "${rm}r $my_gentop"
+ $run ${rm}r "$my_gentop"
+ $show "$mkdir $my_gentop"
+ $run $mkdir "$my_gentop"
+ my_status=$?
+ if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
+ exit $my_status
+ fi
+
+ for my_xlib in $my_oldlibs; do
+ # Extract the objects.
+ case $my_xlib in
+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+ *) my_xabs=`pwd`"/$my_xlib" ;;
+ esac
+ my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
+ my_xdir="$my_gentop/$my_xlib"
+
+ $show "${rm}r $my_xdir"
+ $run ${rm}r "$my_xdir"
+ $show "$mkdir $my_xdir"
+ $run $mkdir "$my_xdir"
+ exit_status=$?
+ if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
+ exit $exit_status
+ fi
+ case $host in
+ *-darwin*)
+ $show "Extracting $my_xabs"
+ # Do not bother doing anything if just a dry run
+ if test -z "$run"; then
+ darwin_orig_dir=`pwd`
+ cd $my_xdir || exit $?
+ darwin_archive=$my_xabs
+ darwin_curdir=`pwd`
+ darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
+ darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
+ if test -n "$darwin_arches"; then
+ darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
+ darwin_arch=
+ $show "$darwin_base_archive has multiple architectures $darwin_arches"
+ for darwin_arch in $darwin_arches ; do
+ mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+ lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+ func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+ cd "$darwin_curdir"
+ $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+ done # $darwin_arches
+ ## Okay now we have a bunch of thin objects, gotta fatten them up :)
+ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
+ darwin_file=
+ darwin_files=
+ for darwin_file in $darwin_filelist; do
+ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+ lipo -create -output "$darwin_file" $darwin_files
+ done # $darwin_filelist
+ ${rm}r unfat-$$
+ cd "$darwin_orig_dir"
+ else
+ cd "$darwin_orig_dir"
+ func_extract_an_archive "$my_xdir" "$my_xabs"
+ fi # $darwin_arches
+ fi # $run
+ ;;
+ *)
+ func_extract_an_archive "$my_xdir" "$my_xabs"
+ ;;
+ esac
+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+ done
+ func_extract_archives_result="$my_oldobjs"
+}
# End of Shell function definitions
#####################################
# Darwin sucks
eval std_shrext=\"$shrext_cmds\"
+disable_libs=no
+
# Parse our command line options once, thoroughly.
while test "$#" -gt 0
do
@@ -305,10 +456,10 @@
--version)
$echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
$echo
- $echo "Copyright (C) 2003 Free Software Foundation, Inc."
+ $echo "Copyright (C) 2005 Free Software Foundation, Inc."
$echo "This is free software; see the source for copying conditions. There is NO"
$echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
- exit $EXIT_SUCCESS
+ exit $?
;;
--config)
@@ -317,7 +468,7 @@
for tagname in $taglist; do
${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
done
- exit $EXIT_SUCCESS
+ exit $?
;;
--debug)
@@ -342,7 +493,7 @@
else
$echo "disable static libraries"
fi
- exit $EXIT_SUCCESS
+ exit $?
;;
--finish) mode="finish" ;;
@@ -357,7 +508,11 @@
preserve_args="$preserve_args $arg"
;;
- --tag) prevopt="--tag" prev=tag ;;
+ --tag)
+ prevopt="--tag"
+ prev=tag
+ preserve_args="$preserve_args --tag"
+ ;;
--tag=*)
set tag "$optarg" ${1+"$@"}
shift
@@ -389,6 +544,18 @@
exit $EXIT_FAILURE
fi
+case $disable_libs in
+no)
+ ;;
+shared)
+ build_libtool_libs=no
+ build_old_libs=yes
+ ;;
+static)
+ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+ ;;
+esac
+
# If this variable is set in any of the actions, the command in it
# will be execed at the end. This prevents here-documents from being
# left over by shells.
@@ -399,7 +566,7 @@
# Infer the operation mode.
if test -z "$mode"; then
$echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
- $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
+ $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
case $nonopt in
*cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
mode=link
@@ -465,7 +632,7 @@
for arg
do
- case "$arg_mode" in
+ case $arg_mode in
arg )
# do not "continue". Instead, add this to base_compile
lastarg="$arg"
@@ -547,7 +714,10 @@
case $lastarg in
# Double-quote args containing other shell metacharacters.
# Many Bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
+ # in scan sets, and some SunOS ksh mistreat backslash-escaping
+ # in scan sets (worked around with variable expansion),
+ # and furthermore cannot handle '|' '&' '(' ')' in scan sets
+ # at all, so we specify them separately.
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
lastarg="\"$lastarg\""
;;
@@ -621,6 +791,14 @@
esac
done
+ qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
+ case $qlibobj in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ qlibobj="\"$qlibobj\"" ;;
+ esac
+ test "X$libobj" != "X$qlibobj" \
+ && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \
+ && $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
if test "X$xdir" = "X$obj"; then
@@ -693,12 +871,17 @@
$run $rm $removelist
exit $EXIT_FAILURE
fi
- $echo $srcfile > "$lockfile"
+ $echo "$srcfile" > "$lockfile"
fi
if test -n "$fix_srcfile_path"; then
eval srcfile=\"$fix_srcfile_path\"
fi
+ qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
+ case $qsrcfile in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ qsrcfile="\"$qsrcfile\"" ;;
+ esac
$run $rm "$libobj" "${libobj}T"
@@ -720,18 +903,18 @@
fbsd_hideous_sh_bug=$base_compile
if test "$pic_mode" != no; then
- command="$base_compile $srcfile $pic_flag"
+ command="$base_compile $qsrcfile $pic_flag"
else
# Don't build PIC code
- command="$base_compile $srcfile"
+ command="$base_compile $qsrcfile"
fi
if test ! -d "${xdir}$objdir"; then
$show "$mkdir ${xdir}$objdir"
$run $mkdir ${xdir}$objdir
- status=$?
- if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
- exit $status
+ exit_status=$?
+ if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
+ exit $exit_status
fi
fi
@@ -803,9 +986,9 @@
if test "$build_old_libs" = yes; then
if test "$pic_mode" != yes; then
# Don't build PIC code
- command="$base_compile $srcfile"
+ command="$base_compile $qsrcfile"
else
- command="$base_compile $srcfile $pic_flag"
+ command="$base_compile $qsrcfile $pic_flag"
fi
if test "$compiler_c_o" = yes; then
command="$command -o $obj"
@@ -934,6 +1117,7 @@
no_install=no
objs=
non_pic_objects=
+ notinst_path= # paths that contain not-installed libtool libraries
precious_files_regex=
prefer_static_libs=no
preload=no
@@ -962,14 +1146,15 @@
if test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
+ prefer_static_libs=yes
else
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
+ prefer_static_libs=built
fi
build_libtool_libs=no
build_old_libs=yes
- prefer_static_libs=yes
break
;;
esac
@@ -1144,6 +1329,11 @@
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
+ else
+ # If the PIC object exists, use it instead.
+ # $xdir was prepended to $pic_object above.
+ non_pic_object="$pic_object"
+ non_pic_objects="$non_pic_objects $non_pic_object"
fi
else
# Only an error if not doing a dry-run.
@@ -1227,6 +1417,13 @@
prev=
continue
;;
+ darwin_framework|darwin_framework_skip)
+ test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+ prev=
+ continue
+ ;;
*)
eval "$prev=\"\$arg\""
prev=
@@ -1285,6 +1482,18 @@
continue
;;
+ -framework|-arch|-isysroot)
+ case " $CC " in
+ *" ${arg} ${1} "* | *" ${arg} ${1} "*)
+ prev=darwin_framework_skip ;;
+ *) compiler_flags="$compiler_flags $arg"
+ prev=darwin_framework ;;
+ esac
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+ continue
+ ;;
+
-inst-prefix-dir)
prev=inst_prefix
continue
@@ -1311,7 +1520,8 @@
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
$echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
- exit $EXIT_FAILURE
+ absdir="$dir"
*** Patch too long, truncated ***
More information about the kaffe
mailing list