gcc/gcc c-typeck.c java/boehm.c java/gjavah.c ...

[mrs@gcc.gnu.org]

CVSROOT:	/cvs/gcc
Module name:	gcc
Branch: 	apple-ppc-branch
Changes by:	mrs@gcc.gnu.org	2004-08-04 01:34:33

Modified files:
	gcc            : c-typeck.c 
	gcc/java       : boehm.c gjavah.c jcf-dump.c jcf-io.c 
	                 jcf-parse.c jcf-write.c lang.c lex.c parse.y 
	                 typeck.c verify.c zextract.c 
Added files:
	gcc/testsuite/gcc.dg: conv-2.c 

Log message:
	Merge in fix for 2535328 from mainline.
	Fix java builds.

Patches:
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/c-typeck.c.diff?cvsroot=gcc&only_with_tag=apple-ppc-branch&r1=1.196.2.43.2.8&r2=1.196.2.43.2.9
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/java/boehm.c.diff?cvsroot=gcc&only_with_tag=apple-ppc-branch&r1=1.13.2.2&r2=1.13.2.2.10.1
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/java/gjavah.c.diff?cvsroot=gcc&only_with_tag=apple-ppc-branch&r1=1.90.2.13.4.1&r2=1.90.2.13.4.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/java/jcf-dump.c.diff?cvsroot=gcc&only_with_tag=apple-ppc-branch&r1=1.45.2.8.4.1&r2=1.45.2.8.4.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/java/jcf-io.c.diff?cvsroot=gcc&only_with_tag=apple-ppc-branch&r1=1.35.2.7.4.1&r2=1.35.2.7.4.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/java/jcf-parse.c.diff?cvsroot=gcc&only_with_tag=apple-ppc-branch&r1=1.118.2.25&r2=1.118.2.25.2.1
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/java/jcf-write.c.diff?cvsroot=gcc&only_with_tag=apple-ppc-branch&r1=1.107.2.20.4.1&r2=1.107.2.20.4.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/java/lang.c.diff?cvsroot=gcc&only_with_tag=apple-ppc-branch&r1=1.103.2.28.4.2&r2=1.103.2.28.4.3
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/java/lex.c.diff?cvsroot=gcc&only_with_tag=apple-ppc-branch&r1=1.86.2.13&r2=1.86.2.13.6.1
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/java/parse.y.diff?cvsroot=gcc&only_with_tag=apple-ppc-branch&r1=1.387.2.52.2.1&r2=1.387.2.52.2.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/java/typeck.c.diff?cvsroot=gcc&only_with_tag=apple-ppc-branch&r1=1.50.2.8.4.1&r2=1.50.2.8.4.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/java/verify.c.diff?cvsroot=gcc&only_with_tag=apple-ppc-branch&r1=1.48.2.7&r2=1.48.2.7.4.1
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/java/zextract.c.diff?cvsroot=gcc&only_with_tag=apple-ppc-branch&r1=1.12.24.2&r2=1.12.24.2.10.1
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/testsuite/gcc.dg/conv-2.c.diff?cvsroot=gcc&only_with_tag=apple-ppc-branch&r1=NONE&r2=1.1.4.1