Re: Eliminate gc.h warning

[Matt Kraai <kraai at alumni dot cmu dot edu>]

On Tue, Jul 01, 2003 at 11:21:51PM -0700, Zack Weinberg wrote:
> Matt Kraai <kraai@alumni.cmu.edu> writes:
> 
> > Howdy,
> >
> > boehm-gc/include/gc.h generates the following warning:
> >
> >  In file included from ../../../../gcc/libjava/java/lang/natObject.cc:282:
> >  ../../../../gcc/boehm-gc/include/gc.h:53:1: warning: "GC_LINUX_THREADS" redefined
> >  <command line>:12:1: warning: this is the location of the previous definition
> >
> > The following patch eliminates this warning.
> 
> Instead, (a) figure out whether it is actually necessary to define
> this on the command line, and if not, take it off; (b) if it is,
> #define GC_LINUX_THREADS 1 instead of wrapping it in #if !defined.

The following patch omits the contents of boehm-cflags from the
libjava compile line.

Bootstrapped and regression tested on powerpc-unknown-linux-gnu.

OK to commit?

-- 
Matt Kraai          kraai@alumni.cmu.edu          Debian GNU/Linux

(libjava):
	* configure.in (GCINCS): Omit the contents of
	boehm-cflags.
	* configure: Regenerate.

Index: libjava/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/configure.in,v
retrieving revision 1.158
diff -3 -c -p -r1.158 configure.in
*** libjava/configure.in	30 Jun 2003 23:53:28 -0000	1.158
--- libjava/configure.in	3 Jul 2003 05:32:05 -0000
*************** case "$GC" in
*** 379,387 ****
      JC1GCSPEC='-fuse-boehm-gc'
      GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs"
  
-     dnl We also want to pick up some cpp flags required when including
-     dnl boehm-config.h.  Yuck.
-     GCINCS="$GCINCS `cat ../boehm-gc/boehm-cflags`"
      GCOBJS=boehm.lo
      GCHDR=boehm-gc.h
      dnl The POSIX thread support needs to know this.
--- 379,384 ----