[kaffe] CVS kaffe (robilad): updated fastjar to version from gcc 4.1.0
Kaffe CVS
cvs-commits at kaffe.org
Mon Apr 3 15:38:27 PDT 2006
PatchSet 7210
Date: 2006/04/03 22:30:23
Author: robilad
Branch: HEAD
Tag: (none)
Log:
updated fastjar to version from gcc 4.1.0
2006-04-03 Dalibor Topic <robilad at kaffe.org>
* THIRDPARTY: Updated fastjar to gcc 4.1.0.
* external/gcc/fastjar: Updated to 4.1.0.
Members:
ChangeLog:1.4717->1.4718
THIRDPARTY:1.44->1.45
external/gcc/fastjar/COPYING:1.1->1.2
external/gcc/fastjar/ChangeLog:1.1->1.2
external/gcc/fastjar/Makefile.in:1.13->1.14
external/gcc/fastjar/aclocal.m4:1.3->1.4
external/gcc/fastjar/compress.c:1.1->1.2
external/gcc/fastjar/compress.h:1.1->1.2
external/gcc/fastjar/config.h.in:1.3->1.4
external/gcc/fastjar/configure:1.5->1.6
external/gcc/fastjar/configure.ac:1.5->1.6
external/gcc/fastjar/dostime.c:1.1->1.2
external/gcc/fastjar/dostime.h:1.1->1.2
external/gcc/fastjar/fastjar.1:1.1->1.2
external/gcc/fastjar/fastjar.info:1.2->1.3
external/gcc/fastjar/fastjar.texi:1.1->1.2
external/gcc/fastjar/grepjar.1:1.1->1.2
external/gcc/fastjar/jargrep.c:1.1->1.2
external/gcc/fastjar/jargrep.h:1.1->1.2
external/gcc/fastjar/jartool.c:1.3->1.4
external/gcc/fastjar/jartool.h:1.1->1.2
external/gcc/fastjar/pushback.c:1.1->1.2
external/gcc/fastjar/pushback.h:1.1->1.2
external/gcc/fastjar/shift.c:1.1->1.2
external/gcc/fastjar/shift.h:1.1->1.2
external/gcc/fastjar/zipfile.h:1.1->1.2
libraries/javalib/external/classpath/config.sub:1.29->1.30
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4717 kaffe/ChangeLog:1.4718
--- kaffe/ChangeLog:1.4717 Mon Apr 3 20:27:08 2006
+++ kaffe/ChangeLog Mon Apr 3 22:30:23 2006
@@ -1,5 +1,11 @@
2006-04-03 Dalibor Topic <robilad at kaffe.org>
+ * THIRDPARTY: Updated fastjar to gcc 4.1.0.
+
+ * external/gcc/fastjar: Updated to 4.1.0.
+
+2006-04-03 Dalibor Topic <robilad at kaffe.org>
+
* Resynchronized GNU Classpath.
2006-04-03 Dalibor Topic <robilad at kaffe.org>
Index: kaffe/THIRDPARTY
diff -u kaffe/THIRDPARTY:1.44 kaffe/THIRDPARTY:1.45
--- kaffe/THIRDPARTY:1.44 Mon Apr 3 19:59:39 2006
+++ kaffe/THIRDPARTY Mon Apr 3 22:30:27 2006
@@ -44,8 +44,7 @@
* external/gcc/fastjar
-This code has been merged in from gcc. Kaffe tracks this projects's
-SVN HEAD.
+This code has been merged in from gcc 4.1.0.
fastjar is distributed under the GNU General Public License Version 2.
Index: kaffe/external/gcc/fastjar/COPYING
diff -u kaffe/external/gcc/fastjar/COPYING:1.1 kaffe/external/gcc/fastjar/COPYING:1.2
--- kaffe/external/gcc/fastjar/COPYING:1.1 Tue Jan 3 15:27:00 2006
+++ kaffe/external/gcc/fastjar/COPYING Mon Apr 3 22:30:28 2006
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Index: kaffe/external/gcc/fastjar/ChangeLog
diff -u kaffe/external/gcc/fastjar/ChangeLog:1.1 kaffe/external/gcc/fastjar/ChangeLog:1.2
--- kaffe/external/gcc/fastjar/ChangeLog:1.1 Tue Jan 3 15:27:00 2006
+++ kaffe/external/gcc/fastjar/ChangeLog Mon Apr 3 22:30:28 2006
@@ -1,14 +1,48 @@
-2005-09-20 Release Manager
+2006-02-28 Release Manager
- * GCC 4.0.2 released.
+ * GCC 4.1.0 released.
-2005-07-07 Release Manager
+2006-02-08 Thomas Fitzsimmons <fitzsim at redhat.com>
- * GCC 4.0.1 released.
+ * jartool.h (ACTION_INDEX): New macro.
+ * jartool.c (main): Handle -i option.
+ * fastjar.texi (Invoking fastjar): Add description of -i option.
-2005-04-20 Release Manager
+2006-01-31 Tom Tromey <tromey at redhat.com>
- * GCC 4.0.0 released.
+ * jartool.c (version): Use 2006.
+ * jargrep.c (version): Use 2006.
+
+2005-06-29 Kelley Cook <kcook at gcc.gnu.org>
+
+ * all files: Update FSF address.
+
+2005-05-17 Kelley Cook <kcook at gcc.gnu.org>
+
+ * configure.ac: Use AC_C_BIGENDIAN instead of AC_C_BIGENDIAN_CROSS.
+ Use AC_CHECK_SIZEOF instead of AC_COMPILE_CHECK_SIZEOF.
+ * Makefile.am: Remove ACLOCAL_AMFLAGS.
+ * aclocal.m4, Makefile.in, configure, config.h.in: Regenerate.
+
+2005-03-28 Marcin Dalecki <martin at dalecki.de>
+
+ * jartool.c (main): Indentation fixlet.
+ (add_entry): Likewise.
+ (init_args): Don't use K&R style.
+ (jt_strdup): Likewise.
+ (get_next_arg): Add explicit '(void)'.
+ (init_headers): Likewise.
+ (version): Likewise.
+
+2005-03-15 Zack Weinberg <zack at codesourcery.com>
+
+ * Makefile.am (fastjar_TEXINFOS): Add gcc-vers.texi.
+ (BASEVER, DEVPHASE): New variables.
+ (POD2MAN): Adjust setting of --release option.
+ (fastjar.1, grepjar.1, gcc-vers.texi): New rules.
+ * Makefile.in: Regenerate.
+ * configure.ac: Do not invoke TL_AC_GCC_VERSION.
+ * aclocal.m4, configure: Regenerate.
2004-12-02 Richard Sandiford <rsandifo at redhat.com>
@@ -68,47 +102,47 @@
* Makefile.in: Regenerate.
* fastjar.texi: Update for '-u'.
-
+
2004-07-06 Casey Marshall <csm at gnu.org>
PR 7854
* Makefile.am
(jar_SOURCES): added shift.c, shift.h.
- (jar_CPPFLAGS): define WITH_SHIFT_DOWN.
+ (jar_CPPFLAGS): define WITH_SHIFT_DOWN.
- * compress.c
- Added FSF copyright.
- (write_data): new function.
- (compress_file): call write_data.
-
- * jartool.c
- Updated copyright year.
- (progname): new variable.
- (end_of_entries): new variable.
- (main): open and read file when updating.
- (find_entry): new function.
- (looks_like_dir): new function.
- (read_entries): new function.
- (make_manifest): added parameter `updating'.
- Call `add_file_to_jar' with `updating'.
- (add_to_jar_with_dir): added parameter `updating'.
- Call `add_to_jar' with `updating'.
- (add_to_jar): added parameter `updating'.
- Call `add_file_to_jar' with `updating'.
- Don't add directories if they already exist.
- (add_file_to_jar): added parameter `updating'.
- Update entries if they already exist.
-
- * jartool.h
- Added #ifndef __FASTJAR_JARTOOL_H__.
- (struct zipentry): added `flags'.
+ * compress.c
+ Added FSF copyright.
+ (write_data): new function.
+ (compress_file): call write_data.
+
+ * jartool.c
+ Updated copyright year.
+ (progname): new variable.
+ (end_of_entries): new variable.
+ (main): open and read file when updating.
+ (find_entry): new function.
+ (looks_like_dir): new function.
+ (read_entries): new function.
+ (make_manifest): added parameter `updating'.
+ Call `add_file_to_jar' with `updating'.
+ (add_to_jar_with_dir): added parameter `updating'.
+ Call `add_to_jar' with `updating'.
+ (add_to_jar): added parameter `updating'.
+ Call `add_file_to_jar' with `updating'.
+ Don't add directories if they already exist.
+ (add_file_to_jar): added parameter `updating'.
+ Update entries if they already exist.
+
+ * jartool.h
+ Added #ifndef __FASTJAR_JARTOOL_H__.
+ (struct zipentry): added `flags'.
- * shift.c: new file.
+ * shift.c: new file.
- * shift.h: new file.
+ * shift.h: new file.
- * zipfile.h
- (CEN_FLAGS): new constant.
+ * zipfile.h
+ (CEN_FLAGS): new constant.
2004-07-05 Kelley Cook <kcook at gcc.gnu.org>
Index: kaffe/external/gcc/fastjar/Makefile.in
diff -u kaffe/external/gcc/fastjar/Makefile.in:1.13 kaffe/external/gcc/fastjar/Makefile.in:1.14
--- kaffe/external/gcc/fastjar/Makefile.in:1.13 Sun Jan 22 19:44:10 2006
+++ kaffe/external/gcc/fastjar/Makefile.in Mon Apr 3 22:30:28 2006
@@ -49,8 +49,7 @@
scripts/ltmain.sh scripts/missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/accross.m4 \
- $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
$(top_srcdir)/m4/ax_cflags_warn_all.m4 \
$(top_srcdir)/m4/gcc_AC_FUNC_MKDIR_TAKES_ONE_ARG.m4 \
$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/configure.ac
Index: kaffe/external/gcc/fastjar/aclocal.m4
diff -u kaffe/external/gcc/fastjar/aclocal.m4:1.3 kaffe/external/gcc/fastjar/aclocal.m4:1.4
--- kaffe/external/gcc/fastjar/aclocal.m4:1.3 Sat Jan 14 22:47:07 2006
+++ kaffe/external/gcc/fastjar/aclocal.m4 Mon Apr 3 22:30:28 2006
@@ -7254,7 +7254,6 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
-m4_include([m4/accross.m4])
m4_include([m4/ax_cflags_gcc_option.m4])
m4_include([m4/ax_cflags_warn_all.m4])
m4_include([m4/gcc_AC_FUNC_MKDIR_TAKES_ONE_ARG.m4])
Index: kaffe/external/gcc/fastjar/compress.c
diff -u kaffe/external/gcc/fastjar/compress.c:1.1 kaffe/external/gcc/fastjar/compress.c:1.2
--- kaffe/external/gcc/fastjar/compress.c:1.1 Tue Jan 3 15:27:00 2006
+++ kaffe/external/gcc/fastjar/compress.c Mon Apr 3 22:30:28 2006
@@ -1,6 +1,15 @@
-/* $Id: compress.c,v 1.1 2006/01/03 15:27:00 robilad Exp $
+/* $Id: compress.c,v 1.2 2006/04/03 22:30:28 robilad Exp $
$Log: compress.c,v $
+ Revision 1.2 2006/04/03 22:30:28 robilad
+ updated fastjar to version from gcc 4.1.0
+
+ 2006-04-03 Dalibor Topic <robilad at kaffe.org>
+
+ * THIRDPARTY: Updated fastjar to gcc 4.1.0.
+
+ * external/gcc/fastjar: Updated to 4.1.0.
+
Revision 1.1 2006/01/03 15:27:00 robilad
Merged in fastjar
@@ -128,7 +137,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.
*/
#include "config.h"
Index: kaffe/external/gcc/fastjar/compress.h
diff -u kaffe/external/gcc/fastjar/compress.h:1.1 kaffe/external/gcc/fastjar/compress.h:1.2
--- kaffe/external/gcc/fastjar/compress.h:1.1 Tue Jan 3 15:27:01 2006
+++ kaffe/external/gcc/fastjar/compress.h Mon Apr 3 22:30:28 2006
@@ -1,6 +1,15 @@
-/* $Id: compress.h,v 1.1 2006/01/03 15:27:01 robilad Exp $
+/* $Id: compress.h,v 1.2 2006/04/03 22:30:28 robilad Exp $
$Log: compress.h,v $
+ Revision 1.2 2006/04/03 22:30:28 robilad
+ updated fastjar to version from gcc 4.1.0
+
+ 2006-04-03 Dalibor Topic <robilad at kaffe.org>
+
+ * THIRDPARTY: Updated fastjar to gcc 4.1.0.
+
+ * external/gcc/fastjar: Updated to 4.1.0.
+
Revision 1.1 2006/01/03 15:27:01 robilad
Merged in fastjar
@@ -79,7 +88,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.
*/
/* Initializes the compression data structure(s) */
Index: kaffe/external/gcc/fastjar/config.h.in
diff -u kaffe/external/gcc/fastjar/config.h.in:1.3 kaffe/external/gcc/fastjar/config.h.in:1.4
--- kaffe/external/gcc/fastjar/config.h.in:1.3 Tue Jan 10 21:16:15 2006
+++ kaffe/external/gcc/fastjar/config.h.in Mon Apr 3 22:30:28 2006
@@ -1,8 +1,5 @@
/* config.h.in. Generated from configure.ac by autoheader. */
-/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
-#undef BYTEORDER
-
/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
*/
#undef HAVE_DIRENT_H
@@ -75,10 +72,6 @@
/* Define to 1 if you have the `_chsize' function. */
#undef HAVE__CHSIZE
-/* Define if the host machine stores words of multi-word integers in
- big-endian order. */
-#undef HOST_WORDS_BIG_ENDIAN
-
/* Define if host mkdir takes a single argument. */
#undef MKDIR_TAKES_ONE_ARG
@@ -100,19 +93,19 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* The number of bytes in type char */
+/* The size of a `char', as computed by sizeof. */
#undef SIZEOF_CHAR
-/* The number of bytes in type int */
+/* The size of a `int', as computed by sizeof. */
#undef SIZEOF_INT
-/* The number of bytes in type long */
+/* The size of a `long', as computed by sizeof. */
#undef SIZEOF_LONG
-/* The number of bytes in type long long */
+/* The size of a `long long', as computed by sizeof. */
#undef SIZEOF_LONG_LONG
-/* The number of bytes in type short */
+/* The size of a `short', as computed by sizeof. */
#undef SIZEOF_SHORT
/* Define to 1 if you have the ANSI C header files. */
@@ -124,7 +117,8 @@
/* Version number of package */
#undef VERSION
-/* whether byteorder is bigendian */
+/* Define to 1 if your processor stores words with the most significant byte
+ first (like Motorola and SPARC, unlike Intel and VAX). */
#undef WORDS_BIGENDIAN
/* Define to rpl_ if the getopt replacement functions and variables should be
Index: kaffe/external/gcc/fastjar/configure
diff -u kaffe/external/gcc/fastjar/configure:1.5 kaffe/external/gcc/fastjar/configure:1.6
--- kaffe/external/gcc/fastjar/configure:1.5 Sat Jan 14 22:47:07 2006
+++ kaffe/external/gcc/fastjar/configure Mon Apr 3 22:30:28 2006
@@ -20361,26 +20361,227 @@
fi
+echo "$as_me:$LINENO: checking for char" >&5
+echo $ECHO_N "checking for char... $ECHO_C" >&6
+if test "${ac_cv_type_char+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if ((char *) 0)
+ return 0;
+if (sizeof (char))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_type_char=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_char=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
+echo "${ECHO_T}$ac_cv_type_char" >&6
+
echo "$as_me:$LINENO: checking size of char" >&5
echo $ECHO_N "checking size of char... $ECHO_C" >&6
if test "${ac_cv_sizeof_char+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- for ac_size in 4 8 1 2 16 12 ; do # List sizes in rough order of prevalence.
- cat >conftest.$ac_ext <<_ACEOF
+ if test "$ac_cv_type_char" = yes; then
+ # The cast to unsigned long works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include "confdefs.h"
-#include <sys/types.h>
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (char))) >= 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (char))) < 0)];
+test_array [0] = 0
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
int
main ()
{
-switch (0) case 0: case (sizeof (char) == $ac_size):;
+static int test_array [1 - 2 * !(((long) (sizeof (char))) >= $ac_mid)];
+test_array [0] = 0
+
;
return 0;
}
@@ -20407,51 +20608,1559 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_sizeof_char=$ac_size
+ ac_lo=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- if test x$ac_cv_sizeof_char != x ; then break; fi
-done
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ac_lo= ac_hi=
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)];
+test_array [0] = 0
-if test x$ac_cv_sizeof_char = x ; then
- { { echo "$as_me:$LINENO: error: cannot determine a size for char" >&5
-echo "$as_me: error: cannot determine a size for char" >&2;}
- { (exit 1); exit 1; }; }
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr '(' $ac_mid ')' + 1`
fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
-echo "${ECHO_T}$ac_cv_sizeof_char" >&6
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_char=$ac_lo;;
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (char), 77
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; } ;;
+esac
+else
+ if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+long longval () { return (long) (sizeof (char)); }
+unsigned long ulongval () { return (long) (sizeof (char)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_CHAR $ac_cv_sizeof_char
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ exit (1);
+ if (((long) (sizeof (char))) < 0)
+ {
+ long i = longval ();
+ if (i != ((long) (sizeof (char))))
+ exit (1);
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+ unsigned long i = ulongval ();
+ if (i != ((long) (sizeof (char))))
+ exit (1);
+ fprintf (f, "%lu\n", i);
+ }
+ exit (ferror (f) || fclose (f) != 0);
+
+ ;
+ return 0;
+}
_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_char=`cat conftest.val`
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+( exit $ac_status )
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (char), 77
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val
+else
+ ac_cv_sizeof_char=0
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
+echo "${ECHO_T}$ac_cv_sizeof_char" >&6
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_CHAR $ac_cv_sizeof_char
+_ACEOF
+
+
+echo "$as_me:$LINENO: checking for short" >&5
+echo $ECHO_N "checking for short... $ECHO_C" >&6
+if test "${ac_cv_type_short+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if ((short *) 0)
+ return 0;
+if (sizeof (short))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_type_short=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_short=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
+echo "${ECHO_T}$ac_cv_type_short" >&6
+
+echo "$as_me:$LINENO: checking size of short" >&5
+echo $ECHO_N "checking size of short... $ECHO_C" >&6
+if test "${ac_cv_sizeof_short+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "$ac_cv_type_short" = yes; then
+ # The cast to unsigned long works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
*** Patch too long, truncated ***
More information about the kaffe
mailing list