mklibgcc.in: Parameterise the script to build soft float functions by iterating over...

        * mklibgcc.in: Parameterise the script to build soft float
	functions by iterating over each type, rather than cloning the
	code for each type.

From-SVN: r107800

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5832c4ecf2b9e6a86f473877f16c8a0a58c497e8..c0b9477457ce7fba54f1f82ff4a8a0cea086746c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-01  Ben Elliston  <bje@au.ibm.com>
+
+        * mklibgcc.in: Parameterise the script to build soft float
+       functions by iterating over each type, rather than cloning the
+       code for each type.
+
 2005-11-30  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        PR middle-end/25158

diff --git a/gcc/mklibgcc.in b/gcc/mklibgcc.in
index 816e301023b930424a666701bf6c3252b2a57e3d..ba853636ac7df364f7f01009f8c3a5a14b564f03 100644 (file)
--- a/gcc/mklibgcc.in
+++ b/gcc/mklibgcc.in
@@ -313,95 +313,41 @@ for ml in $MULTILIBS; do
   # Build software floating point functions.
   #
 
-  if [ "$FPBIT" ]; then
-    for name in $FPBIT_FUNCS; do
-      if [ "$libgcc_s_so" ]; then
-       out="libgcc/${dir}/${name}${objext}"
-       outS="libgcc/${dir}/${name}_s${objext}"
-
-       echo $outS: $FPBIT $fpbit_c_dep
-       echo "  $gcc_s_compile" -DFINE_GRAINED_LIBRARIES $flags -DL$name \
-         -c $FPBIT -o $outS
-
-        echo $out: $FPBIT $fpbit_c_dep
-        echo " $gcc_compile" -DFINE_GRAINED_LIBRARIES $flags -DL$name \
-         '$(vis_hide)' -c $FPBIT -o $out
-
-       echo $libgcc_a: $out
-       echo $libgcc_s_so: $outS
-       if [ "$SHLIB_MKMAP" ]; then
-         echo libgcc/${dir}/libgcc.map: $outS
-       fi
-      else
-       out="libgcc/${dir}/${name}${objext}"
-       echo $out: $FPBIT $fpbit_c_dep
-       echo "  $gcc_compile" -DFINE_GRAINED_LIBRARIES $flags -DL$name \
-         -c $FPBIT -o $out
-
-       echo $libgcc_a: $out
-      fi
-    done
-  fi
-
-  if [ "$DPBIT" ]; then
-    for name in $DPBIT_FUNCS; do
-      if [ "$libgcc_s_so" ]; then
-       out="libgcc/${dir}/${name}${objext}"
-       outS="libgcc/${dir}/${name}_s${objext}"
-
-       echo $outS: $DPBIT $fpbit_c_dep
-       echo "  $gcc_s_compile" -DFINE_GRAINED_LIBRARIES $flags -DL$name \
-         -c $DPBIT -o $outS
-
-        echo $out: $DPBIT $fpbit_c_dep
-        echo " $gcc_compile" -DFINE_GRAINED_LIBRARIES $flags -DL$name \
-         '$(vis_hide)' -c $DPBIT -o $out
-
-       echo $libgcc_a: $out
-       echo $libgcc_s_so: $outS
-       if [ "$SHLIB_MKMAP" ]; then
-         echo libgcc/${dir}/libgcc.map: $outS
-       fi
-      else
-       out="libgcc/${dir}/${name}${objext}"
-       echo $out: $DPBIT $fpbit_c_dep
-       echo "  $gcc_compile" -DFINE_GRAINED_LIBRARIES $flags -DL$name \
-         -c $DPBIT -o $out
-
-       echo $libgcc_a: $out
+  for fpbit_var in FPBIT DPBIT TPBIT ; do
+      fpfuncs_var="${fpbit_var}_FUNCS"
+      eval fpbit=\$$fpbit_var
+      eval fpfuncs=\$$fpfuncs_var
+
+      if [ "$fpbit" ] ; then
+         for name in $fpfuncs; do
+             if [ "$libgcc_s_so" ]; then
+                 out="libgcc/${dir}/${name}${objext}"
+                 outS="libgcc/${dir}/${name}_s${objext}"
+
+                 echo $outS: $fpbit $fpbit_c_dep
+                 echo "        $gcc_s_compile" -DFINE_GRAINED_LIBRARIES $flags -DL$name \
+                     -c $fpbit -o $outS
+
+                 echo $out: $fpbit $fpbit_c_dep
+                 echo "        $gcc_compile" -DFINE_GRAINED_LIBRARIES $flags -DL$name \
+                     '$(vis_hide)' -c $fpbit -o $out
+                 
+                 echo $libgcc_a: $out
+                 echo $libgcc_s_so: $outS
+                 if [ "$SHLIB_MKMAP" ]; then
+                     echo libgcc/${dir}/libgcc.map: $outS
+                 fi
+             else
+                 out="libgcc/${dir}/${name}${objext}"
+                 echo $out: $fpbit $fpbit_c_dep
+                 echo "        $gcc_compile" -DFINE_GRAINED_LIBRARIES $flags -DL$name \
+                     -c $fpbit -o $out
+                 
+                 echo $libgcc_a: $out
+             fi
+         done
       fi
-    done
-  fi
-
-  if [ "$TPBIT" ]; then
-    for name in $TPBIT_FUNCS; do
-      if [ "$libgcc_s_so" ]; then
-       out="libgcc/${dir}/${name}${objext}"
-       outS="libgcc/${dir}/${name}_s${objext}"
-
-       echo $outS: $TPBIT $fpbit_c_dep
-       echo "  $gcc_s_compile" -DFINE_GRAINED_LIBRARIES $flags -DL$name \
-         -c $TPBIT -o $outS
-
-        echo $out: $TPBIT $fpbit_c_dep
-        echo " $gcc_compile" -DFINE_GRAINED_LIBRARIES $flags -DL$name \
-         '$(vis_hide)' -c $TPBIT -o $out
-
-       echo $libgcc_a: $out
-       echo $libgcc_s_so: $outS
-       if [ "$SHLIB_MKMAP" ]; then
-         echo libgcc/${dir}/libgcc.map: $outS
-       fi
-      else
-       out="libgcc/${dir}/${name}${objext}"
-       echo $out: $TPBIT $fpbit_c_dep
-       echo "  $gcc_compile" -DFINE_GRAINED_LIBRARIES $flags -DL$name \
-         -c $TPBIT -o $out
-
-       echo $libgcc_a: $out
-      fi
-    done
-  fi
+  done
 
   for file in $LIB2ADD; do
     name=`echo $file | sed -e 's/[.][cS]$//' -e 's/[.]asm$//'`