Re: enabling cpplib by default

[Gerald Pfeifer <pfeifer at dbai dot tuwien dot ac dot at>]

Is it possible that the new warnings
  tmp-dum.c:0: warning: `#cpu(i386)' re-asserted
  tmp-dum.c:0: warning: `#machine(i386)' re-asserted
etc. I now see on i386-unknown-freebsdelf3.3 are related to this change?

Gerald

---- cut log ----
Configuring for a i386-unknown-freebsdelf3.3 host.
[...]
echo "int xxy_us_dummy;" >tmp-dum.c
./xgcc -B/sw/test/gcc/FreeBSD/i386-unknown-freebsdelf3.3/bin/ -B./ -I/sw/test/gcc/FreeBSD/i386-unknown-freebsdelf3.3/include -S tmp-dum.c
tmp-dum.c:0: warning: `#cpu(i386)' re-asserted
tmp-dum.c:0: warning: `#machine(i386)' re-asserted
echo '/*WARNING: This file is automatically generated!*/' >tmp-under.c
if grep _xxy_us_dummy tmp-dum.s > /dev/null ; then \
  echo "int prepends_underscore = 1;" >>tmp-under.c; \
else \
  echo "int prepends_underscore = 0;" >>tmp-under.c; \
fi
/bin/sh /sw/test/gcc/gcc/gcc/move-if-change tmp-under.c underscore.c
rm -f tmp-dum.c tmp-dum.s
touch s-under
gcc -c  -DIN_GCC    -g -W -Wall -Wtraditional  -DHAVE_CONFIG_H    -I. -I/sw/test/gcc/gcc/gcc -I/sw/test/gcc/gcc/gcc/config -I/sw/test/gcc/gcc/gcc/../include underscore.c
rm -f collect2
gcc  -DIN_GCC    -g -W -Wall -Wtraditional  -DHAVE_CONFIG_H  -o collect2 collect2.o tlink.o hash.o intl.o underscore.o version.o obstack.o        ../libiberty/libiberty.a
gcc -c  -DIN_GCC    -g -W -Wall -Wtraditional  -DHAVE_CONFIG_H    -I. -I/sw/test/gcc/gcc/gcc -I/sw/test/gcc/gcc/gcc/config -I/sw/test/gcc/gcc/gcc/../include /sw/test/gcc/gcc/gcc/cppspec.c
gcc  -DIN_GCC    -g -W -Wall -Wtraditional  -DHAVE_CONFIG_H  -o xcpp gcc.o cppspec.o intl.o \
  prefix.o version.o  obstack.o        ../libiberty/libiberty.a
./xgcc -B/sw/test/gcc/FreeBSD/i386-unknown-freebsdelf3.3/bin/ -B./ -I/sw/test/gcc/FreeBSD/i386-unknown-freebsdelf3.3/include -dumpspecs > tmp-specs
mv tmp-specs specs
rm -f tmplibgcc1.a
for name in _mulsi3 _udivsi3 _divsi3 _umodsi3 _modsi3 _lshrsi3 _ashrsi3 _ashlsi3 _divdf3 _muldf3 _negdf2 _adddf3 _subdf3 _fixdfsi _fixsfsi _floatsidf _floatsisf _truncdfsf2 _extendsfdf2 _addsf3 _negsf2 _subsf3 _mulsf3 _divsf3 _eqdf2 _nedf2 _gtdf2 _gedf2 _ltdf2 _ledf2 _eqsf2 _nesf2 _gtsf2 _gesf2 _ltsf2 _lesf2; \
do \
  echo ${name}; \
  rm -f ${name}.o; \
  cc -DIN_LIBGCC1 -O -I. -I/sw/test/gcc/gcc/gcc -I/sw/test/gcc/gcc/gcc/config -I/sw/test/gcc/gcc/gcc/../include -c -DL${name} /sw/test/gcc/gcc/gcc/libgcc1.c; \
  if [ $? -eq 0 ] ; then true; else exit 1; fi; \
  mv libgcc1.o ${name}.o; \
  ar qc tmplibgcc1.a ${name}.o; \
  rm -f ${name}.o; \
done
_mulsi3
_udivsi3
_divsi3
_umodsi3
_modsi3
_lshrsi3
_ashrsi3
_ashlsi3
_divdf3
_muldf3
_negdf2
_adddf3
_subdf3
_fixdfsi
_fixsfsi
_floatsidf
_floatsisf
_truncdfsf2
_extendsfdf2
_addsf3
_negsf2
_subsf3
_mulsf3
_divsf3
_eqdf2
_nedf2
_gtdf2
_gedf2
_ltdf2
_ledf2
_eqsf2
_nesf2
_gtsf2
_gesf2
_ltsf2
_lesf2
for file in .. ; \
do \
  if [ x${file} != x.. ]; then \
    name=`echo ${file} | sed -e 's/[.][cS]$//' -e 's/[.]asm$//'`; \
    echo ${name}; \
    if [ ${name}.asm = ${file} ]; then \
      cp ${file} ${name}.s || exit 1; file=${name}.s; \
    else true; fi; \
    cc -DIN_LIBGCC1 -O -I. -I/sw/test/gcc/gcc/gcc -I/sw/test/gcc/gcc/gcc/config -I/sw/test/gcc/gcc/gcc/../include -c ${file}; \
    if [ $? -eq 0 ] ; then true; else exit 1; fi; \
    ar qc tmplibgcc1.a ${name}.o; \
    if [ $? -eq 0 ] ; then true; else exit 1; fi; \
    rm -f ${name}.s ${name}.o; \
  else true; \
  fi; \
done
if [ -f ` if [ -f /files1/pfeifer/OBJ-2901-13:57/gcc/../binutils/ranlib ] ; then echo /files1/pfeifer/OBJ-2901-13:57/gcc/../binutils/ranlib ; else if [ "i386-unknown-freebsdelf3.3" = "i386-unknown-freebsdelf3.3" ] ; then echo ranlib; else t='s,^,i386-unknown-freebsdelf3.3-,'; echo ranlib | sed -e $t ; fi; fi` ] || ( [ "i386-unknown-freebsdelf3.3" = "i386-unknown-freebsdelf3.3" ] && [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ) ; then \
  ` if [ -f /files1/pfeifer/OBJ-2901-13:57/gcc/../binutils/ranlib ] ; then echo /files1/pfeifer/OBJ-2901-13:57/gcc/../binutils/ranlib ; else if [ "i386-unknown-freebsdelf3.3" = "i386-unknown-freebsdelf3.3" ] ; then echo ranlib; else t='s,^,i386-unknown-freebsdelf3.3-,'; echo ranlib | sed -e $t ; fi; fi` tmplibgcc1.a; \
else true; fi
mv tmplibgcc1.a libgcc1.a
if [ -f /usr/include/limits.h ] ; then \
  cat /sw/test/gcc/gcc/gcc/limitx.h /sw/test/gcc/gcc/gcc/glimits.h /sw/test/gcc/gcc/gcc/limity.h > tmp-xlimits.h; \
else \
  cat /sw/test/gcc/gcc/gcc/glimits.h > tmp-xlimits.h; \
fi
mv tmp-xlimits.h xlimits.h
gcc -c  -DIN_GCC    -g -W -Wall -Wtraditional  -DHAVE_CONFIG_H    -I. -I/sw/test/gcc/gcc/gcc -I/sw/test/gcc/gcc/gcc/config -I/sw/test/gcc/gcc/gcc/../include /sw/test/gcc/gcc/gcc/cp/g++spec.c
gcc  -DIN_GCC    -g -W -Wall -Wtraditional  -DHAVE_CONFIG_H  -o g++ \
  gcc.o g++spec.o intl.o prefix.o version.o   obstack.o        ../libiberty/libiberty.a
touch stmp-headers
MAKE="gmake --jobs=1"; srcdir=`cd /sw/test/gcc/gcc/gcc/fixinc; pwd` ; \
export MAKE srcdir ; \
cd ./fixinc; /bin/sh ${srcdir}/mkfixinc.sh i386-unknown-freebsdelf3.3
constructing ../fixinc.sh for i386-unknown-freebsdelf3.3
gmake --jobs=1 SHELL="/bin/sh" install
gmake[3]: Entering directory `/files1/pfeifer/OBJ-2901-13:57/gcc/fixinc'
gcc -c -DIN_GCC -g   -I. -I.. -I/sw/test/gcc/gcc/gcc/fixinc -I/sw/test/gcc/gcc/gcc/fixinc/.. -I/sw/test/gcc/gcc/gcc/fixinc/../config -I/sw/test/gcc/gcc/gcc/fixinc/../../include /sw/test/gcc/gcc/gcc/fixinc/fixincl.c
gcc -c -DIN_GCC -g   -I. -I.. -I/sw/test/gcc/gcc/gcc/fixinc -I/sw/test/gcc/gcc/gcc/fixinc/.. -I/sw/test/gcc/gcc/gcc/fixinc/../config -I/sw/test/gcc/gcc/gcc/fixinc/../../include /sw/test/gcc/gcc/gcc/fixinc/server.c
gcc -c -DIN_GCC -g   -I. -I.. -I/sw/test/gcc/gcc/gcc/fixinc -I/sw/test/gcc/gcc/gcc/fixinc/.. -I/sw/test/gcc/gcc/gcc/fixinc/../config -I/sw/test/gcc/gcc/gcc/fixinc/../../include /sw/test/gcc/gcc/gcc/fixinc/procopen.c
gcc -c -DIN_GCC -g   -I. -I.. -I/sw/test/gcc/gcc/gcc/fixinc -I/sw/test/gcc/gcc/gcc/fixinc/.. -I/sw/test/gcc/gcc/gcc/fixinc/../config -I/sw/test/gcc/gcc/gcc/fixinc/../../include /sw/test/gcc/gcc/gcc/fixinc/gnu-regex.c
In file included from /sw/test/gcc/gcc/gcc/fixinc/gnu-regex.c:125:
/usr/include/string.h:53: warning: conflicting types for built-in function `memcmp'
/usr/include/string.h:54: warning: conflicting types for built-in function `memcpy'
/usr/include/string.h:59: warning: conflicting types for built-in function `strcmp'
/usr/include/string.h:61: warning: conflicting types for built-in function `strcpy'
Forbidden identifiers: i386 unix 
gcc -c -DIN_GCC -g   -I. -I.. -I/sw/test/gcc/gcc/gcc/fixinc -I/sw/test/gcc/gcc/gcc/fixinc/.. -I/sw/test/gcc/gcc/gcc/fixinc/../config -I/sw/test/gcc/gcc/gcc/fixinc/../../include /sw/test/gcc/gcc/gcc/fixinc/fixlib.c
gcc -DIN_GCC -g -I. -I.. -I/sw/test/gcc/gcc/gcc/fixinc -I/sw/test/gcc/gcc/gcc/fixinc/.. -I/sw/test/gcc/gcc/gcc/fixinc/../config -I/sw/test/gcc/gcc/gcc/fixinc/../../include -o fixincl fixincl.o server.o procopen.o gnu-regex.o fixlib.o ../../libiberty/libiberty.a
gcc -o fixfixes -DIN_GCC -g   -I. -I.. -I/sw/test/gcc/gcc/gcc/fixinc -I/sw/test/gcc/gcc/gcc/fixinc/.. -I/sw/test/gcc/gcc/gcc/fixinc/../config -I/sw/test/gcc/gcc/gcc/fixinc/../../include -DMAIN \
	/sw/test/gcc/gcc/gcc/fixinc/fixfixes.c gnu-regex.o fixlib.o ../../libiberty/libiberty.a 
gcc -o fixtests -DIN_GCC -g   -I. -I.. -I/sw/test/gcc/gcc/gcc/fixinc -I/sw/test/gcc/gcc/gcc/fixinc/.. -I/sw/test/gcc/gcc/gcc/fixinc/../config -I/sw/test/gcc/gcc/gcc/fixinc/../../include -DMAIN \
	/sw/test/gcc/gcc/gcc/fixinc/fixtests.c gnu-regex.o fixlib.o ../../libiberty/libiberty.a 
cp fixincl.sh ../fixinc.sh
cp fixincl ..
gmake[3]: Leaving directory `/files1/pfeifer/OBJ-2901-13:57/gcc/fixinc'
rm -rf include; mkdir include
chmod a+rx include
TARGET_MACHINE=i386-unknown-freebsdelf3.3; srcdir=`cd /sw/test/gcc/gcc/gcc; pwd`; \
INSTALL_ASSERT_H=install-assert-h; SHELL=/bin/sh ;\
export TARGET_MACHINE srcdir INSTALL_ASSERT_H SHELL ; \
/bin/sh ./fixinc.sh `pwd`/include /usr/include 
Fixing headers into /files1/pfeifer/OBJ-2901-13:57/gcc/include for i386-unknown-freebsdelf3.3 target
Finding directories and links to directories
 Searching /usr/include/.
Making symbolic directory links
Fixing directory /usr/include into /files1/pfeifer/OBJ-2901-13:57/gcc/include
Applying io_use_quotes            to cam/scsi/scsi_pass.h
Applying machine_ansi_h_va_list   to machine/ansi.h
Fixed:  machine/ansi.h
Applying machine_name             to net/zlib.h
Fixed:  net/zlib.h
Applying io_use_quotes            to netatm/atm_ioctl.h
Fixed:  netatm/atm_ioctl.h
Applying io_use_quotes            to netinet/ip_fil.h
Fixed:  netinet/ip_fil.h
Applying io_use_quotes            to netinet/ip_nat.h
Fixed:  netinet/ip_nat.h
Applying end_else_label           to objc/list.h
Fixed:  objc/list.h
Applying end_else_label           to objc/Protocol.h
Fixed:  objc/Protocol.h
Quoted includes in objc/Protocol.h
Applying nested_comment           to rpc/rpc.h
Applying sun_auth_proto           to rpc/svc.h
Applying ultrix_nested_cmnt       to rpc/svc.h
Fixed:  rpc/svc.h
Applying irix_struct__file        to rpc/xdr.h
Applying io_use_quotes            to rpc/des.h
Fixed:  rpc/des.h
Applying hpux_maxint              to sys/param.h
Applying io_use_quotes            to sys/pioctl.h
Applying irix_multiline_cmnt      to sys/types.h
Applying machine_name             to ieeefp.h
Fixed:  ieeefp.h
Applying limits_ifndefs           to limits.h
Applying sun_malloc               to malloc.h
Applying ultrix_const             to stdio.h
Applying sysz_stdlib_for_sun      to stdlib.h
Applying sysv68_string            to string.h
Applying math_exception           to math.h
Fixed:  math.h
Applying avoid_bool               to term.h
Applying avoid_bool               to curses.h
Fixed:  curses.h
Applying machine_name             to zconf.h
Fixed:  zconf.h
Cleaning up unneeded directories:
fixincludes is done
rm -f include/syslimits.h
if [ -f include/limits.h ]; then \
  mv include/limits.h include/syslimits.h; \
else \
  cp /sw/test/gcc/gcc/gcc/gsyslimits.h include/syslimits.h; \
fi
chmod a+r include/syslimits.h
if [ "/usr/include" = "/sw/test/gcc/FreeBSD/i386-unknown-freebsdelf3.3/sys-include" ] \
   && [ -d /sw/test/gcc/FreeBSD/i386-unknown-freebsdelf3.3/sys-include ]; then \
  if [ -d /sw/test/gcc/FreeBSD/lib ] ; then true ; else mkdir /sw/test/gcc/FreeBSD/lib ; fi; \
  if [ -d /sw/test/gcc/FreeBSD/lib/gcc-lib ] ; then true ; else mkdir /sw/test/gcc/FreeBSD/lib/gcc-lib; fi; \
  if [ -d /sw/test/gcc/FreeBSD/lib/gcc-lib/i386-unknown-freebsdelf3.3 ] ; then true ; else mkdir /sw/test/gcc/FreeBSD/lib/gcc-lib/i386-unknown-freebsdelf3.3 ; fi; \
  if [ -d /sw/test/gcc/FreeBSD/lib/gcc-lib/i386-unknown-freebsdelf3.3/2.96 ] ; then true ; else mkdir /sw/test/gcc/FreeBSD/lib/gcc-lib/i386-unknown-freebsdelf3.3/2.96 ; fi; \
else true; fi
touch stmp-fixinc
for file in .. /sw/test/gcc/gcc/gcc/ginclude/stdarg.h /sw/test/gcc/gcc/gcc/ginclude/stddef.h /sw/test/gcc/gcc/gcc/ginclude/varargs.h /sw/test/gcc/gcc/gcc/ginclude/proto.h /sw/test/gcc/gcc/gcc/ginclude/stdbool.h /sw/test/gcc/gcc/gcc/ginclude/iso646.h  /sw/test/gcc/gcc/gcc/cp/inc/typeinfo /sw/test/gcc/gcc/gcc/cp/inc/exception /sw/test/gcc/gcc/gcc/cp/inc/new /sw/test/gcc/gcc/gcc/cp/inc/new.h; do \
  if [ X$file != X.. ]; then \
    realfile=`echo $file | sed -e 's|.*/\([^/]*\)$|\1|'`; \
    touch include/$realfile; \
    rm -f include/$realfile; \
    cp $file include; \
    chmod a+r include/$realfile; \
  fi; \
done
rm -f include/limits.h
cp xlimits.h include/limits.h
chmod a+r include/limits.h
rm -f include/float.h
if [ xfloat-i64.h != xMakefile.in ]; then \
  cp /sw/test/gcc/gcc/gcc/config/float-i64.h include/float.h && \
  chmod a+r include/float.h; \
else :; fi
rm -f include/README
cp /sw/test/gcc/gcc/gcc/README-fixinc include/README
chmod a+r include/README
touch stmp-int-hdrs
if [ -f libgcc2.ready ] ; then \
	true; \
else \
	touch libgcc2.ready; \
fi
case " c  " in \
*" "[cC]"++ "*) \
  echo tinfo.o tinfo2.o new.o opnew.o opnewnt.o opvnew.o opvnewnt.o opdel.o opdelnt.o opvdel.o opvdelnt.o exception.o > cplib2.new;; \
*) \
  echo "" > cplib2.new;; \
esac
mv -f cplib2.new cplib2.txt 
rm -f tmplibgcc2.a
for name in _muldi3 _divdi3 _moddi3 _udivdi3 _umoddi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 _ffsdi2 _udiv_w_sdiv _udivmoddi4 _cmpdi2 _ucmpdi2 _floatdidf _floatdisf _fixunsdfsi _fixunssfsi _fixunsdfdi _fixdfdi _fixunssfdi _fixsfdi _fixxfdi _fixunsxfdi _floatdixf _fixunsxfsi _fixtfdi _fixunstfdi _floatditf __gcc_bcmp _varargs __dummy _eprintf _bb _shtab _clear_cache _trampoline __main _exit _ctors _pure; \
do \
  echo ${name}; \
  ./xgcc -B/sw/test/gcc/FreeBSD/i386-unknown-freebsdelf3.3/bin/ -B./ -I/sw/test/gcc/FreeBSD/i386-unknown-freebsdelf3.3/include -O2   -DIN_GCC    -g -W -Wall -Wtraditional -I./include   -g1  -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED  -I. -I/sw/test/gcc/gcc/gcc -I/sw/test/gcc/gcc/gcc/config -I/sw/test/gcc/gcc/gcc/../include -c -DL${name} \
       /sw/test/gcc/gcc/gcc/libgcc2.c -o ${name}.o; \
  if [ $? -eq 0 ] ; then true; else exit 1; fi; \
  ` if [ -f /files1/pfeifer/OBJ-2901-13:57/gcc/../binutils/ar ] ; then echo /files1/pfeifer/OBJ-2901-13:57/gcc/../binutils/ar ; else if [ "i386-unknown-freebsdelf3.3" = "i386-unknown-freebsdelf3.3" ] ; then echo ar; else t='s,^,i386-unknown-freebsdelf3.3-,'; echo ar | sed -e $t ; fi; fi` rc tmplibgcc2.a ${name}.o; \
  rm -f ${name}.o; \
done
_muldi3
/sw/test/gcc/gcc/gcc/libgcc2.c:0: warning: `#cpu(i386)' re-asserted
/sw/test/gcc/gcc/gcc/libgcc2.c:0: warning: `#machine(i386)' re-asserted
_divdi3
/sw/test/gcc/gcc/gcc/libgcc2.c:0: warning: `#cpu(i386)' re-asserted
/sw/test/gcc/gcc/gcc/libgcc2.c:0: warning: `#machine(i386)' re-asserted
_moddi3
/sw/test/gcc/gcc/gcc/libgcc2.c:0: warning: `#cpu(i386)' re-asserted
/sw/test/gcc/gcc/gcc/libgcc2.c:0: warning: `#machine(i386)' re-asserted
_udivdi3
/sw/test/gcc/gcc/gcc/libgcc2.c:0: warning: `#cpu(i386)' re-asserted
/sw/test/gcc/gcc/gcc/libgcc2.c:0: warning: `#machine(i386)' re-asserted
[...]