This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Allow genmultilib to be reentrant
- From: Geoffrey Keating <gkeating at apple dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Mon, 16 Dec 2002 21:22:29 -0800 (PST)
- Subject: Allow genmultilib to be reentrant
I hit an interesting problem when genmultilib was run twice, the
second starting before the first had finished. I couldn't reproduce
the problem, and this isn't a total solution anyway (it would need a
Makefile change), but it will help if this happens in future.
Tested on powerpc-eabisim.
--
- Geoffrey Keating <geoffk@apple.com>
===File ~/patches/gcc-genmulticoncur.patch==================
2002-12-16 Geoffrey Keating <geoffk@apple.com>
* genmultilib: Create temporary files in unique subdirectory.
Index: genmultilib
===================================================================
RCS file: /cvs/gcc/gcc/gcc/genmultilib,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 genmultilib
--- genmultilib 5 Oct 2002 18:55:54 -0000 1.10
+++ genmultilib 17 Dec 2002 05:19:14 -0000
@@ -1,6 +1,6 @@
#!/bin/sh
# 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.
@@ -120,6 +120,9 @@ enable_multilib=$8
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
# options. Each combination which includes a set of mutually
# exclusive options must then be output multiple times, once for each
@@ -161,11 +164,8 @@ chmod +x tmpmultilib
combinations=`initial=/ ./tmpmultilib ${options}`
-rm -f tmpmultilib
-
# If there exceptions, weed them out now
if [ -n "${exceptions}" ]; then
- rm -f tmpmultilib2
cat >tmpmultilib2 <<\EOF
#!/bin/sh
# This recursive script weeds out any combination of multilib
@@ -187,7 +187,6 @@ cat >>tmpmultilib2 <<\EOF
EOF
chmod +x tmpmultilib2
combinations=`./tmpmultilib2 ${combinations}`
- rm -f ./tmpmultilib2
fi
# Construct a sed pattern which will convert option names to directory
@@ -371,6 +370,7 @@ moptions=`echo ${options} | sed -e 's,[
echo ""
echo "static const char *multilib_options = \"${moptions}\";"
-rm -f tmpmultilib2
+cd ..
+rm -r tmpmultilib.$$
exit 0
============================================================