Commit c79d892f by Geoffrey Keating Committed by Geoffrey Keating

* genmultilib: Create temporary files in unique subdirectory.

From-SVN: r60195
parent 7a975113
2002-12-16 Geoffrey Keating <geoffk@apple.com> 2002-12-16 Geoffrey Keating <geoffk@apple.com>
* genmultilib: Create temporary files in unique subdirectory.
* gcc.c (validate_switches): Allow '@' as a switch name. * gcc.c (validate_switches): Allow '@' as a switch name.
2002-12-16 Loren J. Rittle <ljrittle@acm.org> 2002-12-16 Loren J. Rittle <ljrittle@acm.org>
......
#!/bin/sh #!/bin/sh
# Generates multilib.h. # Generates multilib.h.
# Copyright (C) 1994, 1995, 1996, 1997, 1999 Free Software Foundation, Inc. # Copyright (C) 1994, 1995, 1996, 1997, 1999, 2002 Free Software Foundation, Inc.
#This file is part of GCC. #This file is part of GCC.
...@@ -120,6 +120,9 @@ enable_multilib=$8 ...@@ -120,6 +120,9 @@ enable_multilib=$8
echo "static const char *const multilib_raw[] = {" echo "static const char *const multilib_raw[] = {"
mkdir tmpmultilib.$$ || exit 1
cd tmpmultilib.$$ || exit 1
# What we want to do is select all combinations of the sets in # What we want to do is select all combinations of the sets in
# options. Each combination which includes a set of mutually # options. Each combination which includes a set of mutually
# exclusive options must then be output multiple times, once for each # exclusive options must then be output multiple times, once for each
...@@ -161,11 +164,8 @@ chmod +x tmpmultilib ...@@ -161,11 +164,8 @@ chmod +x tmpmultilib
combinations=`initial=/ ./tmpmultilib ${options}` combinations=`initial=/ ./tmpmultilib ${options}`
rm -f tmpmultilib
# If there exceptions, weed them out now # If there exceptions, weed them out now
if [ -n "${exceptions}" ]; then if [ -n "${exceptions}" ]; then
rm -f tmpmultilib2
cat >tmpmultilib2 <<\EOF cat >tmpmultilib2 <<\EOF
#!/bin/sh #!/bin/sh
# This recursive script weeds out any combination of multilib # This recursive script weeds out any combination of multilib
...@@ -187,7 +187,6 @@ cat >>tmpmultilib2 <<\EOF ...@@ -187,7 +187,6 @@ cat >>tmpmultilib2 <<\EOF
EOF EOF
chmod +x tmpmultilib2 chmod +x tmpmultilib2
combinations=`./tmpmultilib2 ${combinations}` combinations=`./tmpmultilib2 ${combinations}`
rm -f ./tmpmultilib2
fi fi
# Construct a sed pattern which will convert option names to directory # Construct a sed pattern which will convert option names to directory
...@@ -371,6 +370,7 @@ moptions=`echo ${options} | sed -e 's,[ ][ ]*, ,g'` ...@@ -371,6 +370,7 @@ moptions=`echo ${options} | sed -e 's,[ ][ ]*, ,g'`
echo "" echo ""
echo "static const char *multilib_options = \"${moptions}\";" echo "static const char *multilib_options = \"${moptions}\";"
rm -f tmpmultilib2 cd ..
rm -r tmpmultilib.$$
exit 0 exit 0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment