* tree.h (DECL_SEEN_IN_BIND_EXPR_P): New macro.

[pf3gnuchains/gcc-fork.git] / gcc / mklibgcc.in

diff --git a/gcc/mklibgcc.in b/gcc/mklibgcc.in
index c2eea1a..9835f62 100644 (file)
--- a/gcc/mklibgcc.in
+++ b/gcc/mklibgcc.in
@@ -123,7 +123,7 @@ for name in $lib2funcs; do
     out="libgcc/${dir}/${name}${objext}"
 
     echo $out: $libgcc2_c_dep
-    echo "     $gcc_compile" '$(MAYBE_USE_COLLECT2)' $flags -DL$name \
+    echo "     $gcc_compile" $flags -DL$name \
       -c '$(srcdir)/libgcc2.c' -o $out
   done
   libgcc2_objs="$libgcc2_objs ${name}${objext}"
@@ -136,7 +136,7 @@ for name in $LIB2FUNCS_ST; do
     out="libgcc/${dir}/${name}${objext}"
 
     echo $out: $libgcc2_c_dep
-    echo "     $gcc_compile" '$(MAYBE_USE_COLLECT2)' $flags -DL$name \
+    echo "     $gcc_compile" $flags -DL$name \
       -c '$(srcdir)/libgcc2.c' -o $out
   done
   libgcc2_st_objs="$libgcc2_st_objs ${name}${objext}"
@@ -149,7 +149,7 @@ for name in $LIB2_DIVMOD_FUNCS; do
     out="libgcc/${dir}/${name}${objext}"
 
     echo $out: $libgcc2_c_dep
-    echo "     $gcc_compile" '$(MAYBE_USE_COLLECT2)' $flags -DL$name \
+    echo "     $gcc_compile" $flags -DL$name \
       -c '$(srcdir)/libgcc2.c' -fexceptions -fnon-call-exceptions -o $out
   done
   libgcc2_objs="$libgcc2_objs ${name}${objext}"
@@ -271,7 +271,7 @@ for name in $LIBGCOV; do
     out="libgcc/${dir}/${name}${objext}"
 
     echo $out: $libgcov_c_dep
-    echo "     $gcc_compile" '$(MAYBE_USE_COLLECT2)' $flags -DL$name \
+    echo "     $gcc_compile" $flags -DL$name \
       -c '$(srcdir)/libgcov.c' -o $out
   done
   libgcov_objs="$libgcov_objs ${name}${objext}"
@@ -347,19 +347,27 @@ EOF
       # .oS objects will have all non-local symbol definitions .hidden
       oS=`echo ${o} | sed s~${objext}'$~.oS~g'`
       echo "${oS}: stmp-dirs libgcc/${dir}/stacknote.s ${o}"
-      echo '   ( $(NM_FOR_TARGET) '${SHLIB_NM_FLAGS} ${o}' | $(AWK) '\''NF == 3 { print "\t.hidden", $$3 }'\''; cat libgcc/${dir}/stacknote.s ) | $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) '${flags}' -r -nostdinc -nostdlib -o $@ '${o}' -xassembler -'
+      # non-GNU nm emits three fields even for undefined and typeless symbols,
+      # so explicitly omit them
+      echo '   ( $(NM_FOR_TARGET) '${SHLIB_NM_FLAGS} ${o}' | $(AWK) '\''NF == 3 && $$2 !~ /^[UN]$$/ { print "\t.hidden", $$3 }'\''; cat libgcc/${dir}/stacknote.s ) | $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) '${flags}' -r -nostdinc -nostdlib -o $@ '${o}' -xassembler -'
       libgcc_a_objs="${libgcc_a_objs} ${oS}"
     done
   fi
 
+  # Each of these .a files depends on stmp-dirs.  It would seem that
+  # this dependency is redundant, since each of the object files
+  # itself depends on stmp-dirs.  However, it is possible that there
+  # are in fact no object files.  In that case, the stmp-dirs
+  # dependency is required; the directory containing the archive must
+  # exist before the archive itself can be created.
   echo ""
-  echo "${dir}/libgcc.a: $libgcc_a_objs"
+  echo "${dir}/libgcc.a: stmp-dirs $libgcc_a_objs"
   echo "       -rm -rf ${dir}/libgcc.a"
   echo '       $(AR_CREATE_FOR_TARGET)' ${dir}/libgcc.a $libgcc_a_objs
   echo '       $(RANLIB_FOR_TARGET)' ${dir}/libgcc.a
 
   echo ""
-  echo "${dir}/libgcov.a: $libgcov_a_objs"
+  echo "${dir}/libgcov.a: stmp-dirs $libgcov_a_objs"
   echo "       -rm -rf ${dir}/libgcov.a"
   echo '       $(AR_CREATE_FOR_TARGET)' ${dir}/libgcov.a $libgcov_a_objs
   echo '       $(RANLIB_FOR_TARGET)' ${dir}/libgcov.a
@@ -367,7 +375,7 @@ EOF
   if [ "$SHLIB_LINK" ]; then
 
     echo ""
-    echo "${dir}/libgcc_eh.a: $libgcc_eh_objs"
+    echo "${dir}/libgcc_eh.a: stmp-dirs $libgcc_eh_objs"
     echo "     -rm -rf ${dir}/libgcc_eh.a"
     echo '     $(AR_CREATE_FOR_TARGET)' ${dir}/libgcc_eh.a $libgcc_eh_objs
     echo '     $(RANLIB_FOR_TARGET)' ${dir}/libgcc_eh.a
@@ -380,6 +388,7 @@ EOF
       fi
       shlib_so_name="$shlib_base_name"
       shlib_dir=
+      shlib_slibdir_qual=
       if [ -n "$MULTILIB_OSDIRNAMES" ]; then
        if [ "$dir" != . ]; then
          gcc_multilib_dir=`./xgcc -B./ $flags --print-multi-directory`
@@ -389,8 +398,12 @@ EOF
          os_multilib_base=`echo $os_multilib_dir | sed -n "s~/${gcc_multilib_sup}\$~~p"`
          if [ -z "$os_multilib_base" ]; then
            shlib_so_name=libgcc_s
+           if [ "$os_multilib_dir" != "." ]; then
+               shlib_slibdir_qual="/$os_multilib_dir"
+           fi
          else
            shlib_so_name=libgcc_s_`echo $gcc_multilib_sup | sed s,/,_,g`
+           shlib_slibdir_qual="/$os_multilib_base"
          fi
        fi
       fi
@@ -403,7 +416,8 @@ EOF
               -e "s%@shlib_base_name@%$shlib_base_name%g" \
               -e "s%@shlib_map_file@%$mapfile%g" \
               -e "s%@shlib_so_name@%$shlib_so_name%g" \
-              -e "s%@shlib_dir@%$shlib_dir%g"
+              -e "s%@shlib_dir@%$shlib_dir%g" \
+              -e "s%@shlib_slibdir_qual@%%g"
     elif [ "$SHLIB_MULTILIB" = "$dir" ]; then
       shlib_base_name="libgcc_s";
       echo ""
@@ -415,7 +429,8 @@ EOF
               -e "s%@shlib_base_name@%$shlib_base_name%g" \
               -e "s%@shlib_map_file@%$mapfile%g" \
               -e "s%@shlib_so_name@%$shlib_base_name%g" \
-              -e "s%@shlib_dir@%%g"
+              -e "s%@shlib_dir@%%g" \
+              -e "s%@shlib_slibdir_qual@%%g"
     fi
   fi
 done