gcc/

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

diff --git a/gcc/mklibgcc.in b/gcc/mklibgcc.in
index cfef2bf..3cdd4bb 100644 (file)
--- a/gcc/mklibgcc.in
+++ b/gcc/mklibgcc.in
@@ -85,7 +85,7 @@ make_compile='$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
 libgcc_dep='$(CONFIG_H) coretypes.h $(TM_H) $(MACHMODE_H) longlong.h config.status stmp-int-hdrs tsystem.h'
 
 # Dependencies for libgcc2.c
-libgcc2_c_dep='stmp-dirs $(srcdir)/libgcc2.c gbl-ctors.h'" $libgcc_dep"
+libgcc2_c_dep='stmp-dirs $(srcdir)/libgcc2.c $(srcdir)/libgcc2.h gbl-ctors.h'" $libgcc_dep"
 
 # Dependencies for libgcov.c
 libgcov_c_dep='stmp-dirs $(srcdir)/libgcov.c $(srcdir)/gcov-io.h $(srcdir)/gcov-io.c gcov-iov.h'" $libgcc_dep"
@@ -99,7 +99,7 @@ if [ "$SHLIB_LINK" ]; then
   # overriding that with #pragmas.  The dance with @ is to prevent
   # echo from seeing anything it might take for an option.
   echo "vis_hide := \$(strip \$(subst @,-,\\"
-  echo "    \$(shell if echo 'void foo(void);' | \\"
+  echo "    \$(shell if echo 'void foo(void); void foo(void) {}' | \\"
   echo "          $gcc_compile -fvisibility=hidden -Werror \\"
   echo "          -c -xc - -o /dev/null 2> /dev/null; \\"
   echo "          then echo @fvisibility=hidden @DHIDE_EXPORTS; \\"
@@ -173,21 +173,21 @@ for ml in $MULTILIBS; do
     if [ -z "$SHLIB_MULTILIB" ]; then
       if [ "$dir" = . ]; then
        libgcc_eh_a=$dir/libgcc_eh.a
-       libgcc_s_so_base=$dir/libgcc_s
+       libgcc_s_so_base=libgcc_s
        libgcc_s_so=${libgcc_s_so_base}${SHLIB_EXT}
        libgcc_s_soname=libgcc_s
        if [ "$LIBUNWIND" ]; then
-         libunwind_so_base=$dir/libunwind
+         libunwind_so_base=libunwind
          libunwind_so=${libunwind_so_base}${SHLIB_EXT}
          libunwind_soname=libunwind
        fi
       else
        libgcc_eh_a=$dir/libgcc_eh.a
-       libgcc_s_so_base=$dir/libgcc_s_${suffix}
+       libgcc_s_so_base=libgcc_s_${suffix}
        libgcc_s_so=${libgcc_s_so_base}${SHLIB_EXT}
        libgcc_s_soname=libgcc_s_${suffix}
        if [ "$LIBUNWIND" ]; then
-         libunwind_so_base=$dir/libunwind_${suffix}
+         libunwind_so_base=libunwind_${suffix}
          libunwind_so=${libunwind_so_base}${SHLIB_EXT}
        fi
       fi
@@ -215,11 +215,11 @@ for ml in $MULTILIBS; do
 
     elif [ "$SHLIB_MULTILIB" = "$dir" ]; then
       libgcc_eh_a=$dir/libgcc_eh.a
-      libgcc_s_so_base=$dir/libgcc_s
+      libgcc_s_so_base=libgcc_s
       libgcc_s_so=${libgcc_s_so_base}${SHLIB_EXT}
       libgcc_s_soname=libgcc_s
       if [ "$LIBUNWIND" ]; then
-       libunwind_so_base=$dir/libunwind
+       libunwind_so_base=libunwind
        libunwind_so=${libunwind_so_base}${SHLIB_EXT}
        libunwind_soname=libunwind
       fi
@@ -774,7 +774,6 @@ EOF
               -e "s%@shlib_base_name@%$libgcc_s_so_base%g" \
               -e "s%@shlib_so_name@%$libgcc_s_soname%g" \
               -e "s%@shlib_map_file@%$mapfile%g" \
-              -e "s%@shlib_dir@%$shlib_dir%g" \
               -e "s%@shlib_slibdir_qual@%$shlib_dir_qual%g"
     echo "all: $libgcc_s_so"
   fi
@@ -788,7 +787,6 @@ EOF
                 -e "s%@shlib_objs@%\$(objects)%g" \
                 -e "s%@shlib_base_name@%$libunwind_so_base%g" \
                 -e "s%@shlib_so_name@%$libunwind_soname%g" \
-                -e "s%@shlib_dir@%$shlib_dir%g" \
                 -e "s%@shlib_slibdir_qual@%$shlib_dir_qual%g"
     echo "all: $libunwind_so"
   fi
@@ -870,13 +868,11 @@ for ml in $MULTILIBS; do
       echo "   $SHLIB_INSTALL" \
        | sed -e "s%@shlib_base_name@%$shlib_base_name%g" \
              -e "s%@shlib_so_name@%$shlib_so_name%g" \
-             -e "s%@shlib_dir@%$shlib_dir%g" \
              -e "s%@shlib_slibdir_qual@%$shlib_slibdir_qual%g"
       if [ "$LIBUNWIND" ]; then
        echo "  $SHLIBUNWIND_INSTALL" \
           | sed -e "s%@shlib_base_name@%$shlibunwind_base_name%g" \
                 -e "s%@shlib_so_name@%$shlibunwind_so_name%g" \
-                -e "s%@shlib_dir@%$shlib_dir%g" \
                 -e "s%@shlib_slibdir_qual@%$shlib_slibdir_qual%g"
        libunwinddir='$(DESTDIR)$(slibdir)$(shlib_slibdir_qual)/$(shlib_dir)'
        echo '  $(INSTALL_DATA)' ${dir}/libunwind.a ${libunwinddir}/
@@ -887,13 +883,11 @@ for ml in $MULTILIBS; do
       echo "   $SHLIB_INSTALL" \
        | sed -e "s%@shlib_base_name@%$shlib_base_name%g" \
              -e "s%@shlib_so_name@%$shlib_base_name%g" \
-             -e "s%@shlib_dir@%%g" \
              -e "s%@shlib_slibdir_qual@%%g"
       if [ "$LIBUNWIND" ]; then
        echo "  $SHLIBUNWIND_INSTALL" \
           | sed -e "s%@shlib_base_name@%$shlibunwind_base_name%g" \
                 -e "s%@shlib_so_name@%$shlibunwind_base_name%g" \
-                -e "s%@shlib_dir@%%g" \
                 -e "s%@shlib_slibdir_qual@%%g"
        libunwinddir='$(DESTDIR)$(slibdir)'
        echo '  $(INSTALL_DATA)' ${dir}/libunwind.a ${libunwinddir}/