Re: rfc: new libgcc build mechanism

[Richard Henderson <rth at cygnus dot com>]

Bother.  Clearly I should have done my cross testing
from Solaris instead of Linux.


r~


        * mklibgcc.in: Restrict OLDCC=GCC test to native.  Equate
        LIBGCC1 empty with libgcc1.null.

Index: mklibgcc.in
===================================================================
RCS file: /cvs/gcc/egcs/gcc/mklibgcc.in,v
retrieving revision 1.1
diff -c -p -d -r1.1 mklibgcc.in
*** mklibgcc.in	2000/05/03 18:21:49	1.1
--- mklibgcc.in	2000/05/03 20:59:24
*************** echo
*** 33,48 ****
  # is not needed.  This is not quite the same as libgcc1.null, even
  # on a target not using libgcc1-asm.a.
  
! tmp="tmp-$$.c"
! cat > $tmp <<EOF
  #ifdef __GNUC__
    yes;
  #endif
  EOF
! if $OLDCC -E $tmp | grep yes > /dev/null 2>&1; then
!   LIB1FUNCS=""
  fi
- rm -f $tmp
  
  
  #
--- 33,50 ----
  # is not needed.  This is not quite the same as libgcc1.null, even
  # on a target not using libgcc1-asm.a.
  
! if [ "@build_canonical@" = "@target@" ]; then
!   tmp="tmp-$$.c"
!   cat > $tmp <<EOF
  #ifdef __GNUC__
    yes;
  #endif
  EOF
!   if $OLDCC -E $tmp | grep yes > /dev/null 2>&1; then
!     LIB1FUNCS=""
!   fi
!   rm -f $tmp
  fi
  
  
  #
*************** fpbit_c_dep='$(srcdir)/config/fp-bit.c c
*** 112,126 ****
  
  libgcc1_objs=""
  
! case "$LIBGCC1" in
!   libgcc1.null)
      ;;
  
!   libgcc1.cross)
      echo "You must find a way to make libgcc1 components yourself" 1>&2
      ;;
  
!   libgcc1-asm.a)
      for name in $LIB1ASMFUNCS; do
        for ml in $MULTILIBS; do
          dir=`echo ${ml} | sed -e 's/;.*$//'`
--- 114,128 ----
  
  libgcc1_objs=""
  
! case X"$LIBGCC1" in
!   Xlibgcc1.null | X)
      ;;
  
!   Xlibgcc1.cross)
      echo "You must find a way to make libgcc1 components yourself" 1>&2
      ;;
  
!   Xlibgcc1-asm.a)
      for name in $LIB1ASMFUNCS; do
        for ml in $MULTILIBS; do
          dir=`echo ${ml} | sed -e 's/;.*$//'`
*************** case "$LIBGCC1" in
*** 135,141 ****
      done
      ;;
  
!   *)
      for name in $LIB1FUNCS; do
        out="libgcc/${name}${objext}"
  
--- 137,143 ----
      done
      ;;
  
!   Xlibgcc.a)
      for name in $LIB1FUNCS; do
        out="libgcc/${name}${objext}"
  
*************** case "$LIBGCC1" in
*** 156,161 ****
--- 158,167 ----
        emit_oldcc_compile $out $file
        libgcc1_objs="$libgcc1_objs ${name}${objext}"
      done
+     ;;
+   *)
+     echo "I'm confused about libgcc1." 1>&2
+     exit 1
      ;;
  esac