From f103fa7a35f8a0b685c914de99d913cc0a655808 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Thu, 21 Apr 2011 13:08:58 +0000 Subject: [PATCH] Makefile.in (site.exp): Do not use tmp0 but site.tmp as temporary file name. 2011-04-21 Richard Guenther * Makefile.in (site.exp): Do not use tmp0 but site.tmp as temporary file name. From-SVN: r172826 --- gcc/ChangeLog | 5 ++++ gcc/Makefile.in | 74 ++++++++++++++++++++++++------------------------- 2 files changed, 42 insertions(+), 37 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a505c250934..f52081501bf 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2011-04-21 Richard Guenther + + * Makefile.in (site.exp): Do not use tmp0 but site.tmp as temporary + file name. + 2011-04-21 Richard Guenther * tree-ssa-alias.c (ptr_deref_may_alias_decl_p): Handle diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 68cf1ace61e..212b5381a43 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -4848,39 +4848,39 @@ target_subdir = @target_subdir@ site.exp: ./config.status Makefile @echo "Making a new config file..." - -@rm -f ./tmp? + -@rm -f ./site.tmp @$(STAMP) site.exp -@mv site.exp site.bak - @echo "## these variables are automatically generated by make ##" > ./tmp0 - @echo "# Do not edit here. If you wish to override these values" >> ./tmp0 - @echo "# add them to the last section" >> ./tmp0 - @echo "set rootme \"`${PWD_COMMAND}`\"" >> ./tmp0 - @echo "set srcdir \"`cd ${srcdir}; ${PWD_COMMAND}`\"" >> ./tmp0 - @echo "set host_triplet $(host)" >> ./tmp0 - @echo "set build_triplet $(build)" >> ./tmp0 - @echo "set target_triplet $(target)" >> ./tmp0 - @echo "set target_alias $(target_noncanonical)" >> ./tmp0 - @echo "set libiconv \"$(LIBICONV)\"" >> ./tmp0 + @echo "## these variables are automatically generated by make ##" > ./site.tmp + @echo "# Do not edit here. If you wish to override these values" >> ./site.tmp + @echo "# add them to the last section" >> ./site.tmp + @echo "set rootme \"`${PWD_COMMAND}`\"" >> ./site.tmp + @echo "set srcdir \"`cd ${srcdir}; ${PWD_COMMAND}`\"" >> ./site.tmp + @echo "set host_triplet $(host)" >> ./site.tmp + @echo "set build_triplet $(build)" >> ./site.tmp + @echo "set target_triplet $(target)" >> ./site.tmp + @echo "set target_alias $(target_noncanonical)" >> ./site.tmp + @echo "set libiconv \"$(LIBICONV)\"" >> ./site.tmp # CFLAGS is set even though it's empty to show we reserve the right to set it. - @echo "set CFLAGS \"\"" >> ./tmp0 - @echo "set CXXFLAGS \"\"" >> ./tmp0 - @echo "set HOSTCC \"$(CC)\"" >> ./tmp0 - @echo "set HOSTCFLAGS \"$(CFLAGS)\"" >> ./tmp0 + @echo "set CFLAGS \"\"" >> ./site.tmp + @echo "set CXXFLAGS \"\"" >> ./site.tmp + @echo "set HOSTCC \"$(CC)\"" >> ./site.tmp + @echo "set HOSTCFLAGS \"$(CFLAGS)\"" >> ./site.tmp # When running the tests we set GCC_EXEC_PREFIX to the install tree so that # files that have already been installed there will be found. The -B option # overrides it, so use of GCC_EXEC_PREFIX will not result in using GCC files # from the install tree. - @echo "set TEST_GCC_EXEC_PREFIX \"$(libdir)/gcc/\"" >> ./tmp0 - @echo "set TESTING_IN_BUILD_TREE 1" >> ./tmp0 - @echo "set HAVE_LIBSTDCXX_V3 1" >> ./tmp0 + @echo "set TEST_GCC_EXEC_PREFIX \"$(libdir)/gcc/\"" >> ./site.tmp + @echo "set TESTING_IN_BUILD_TREE 1" >> ./site.tmp + @echo "set HAVE_LIBSTDCXX_V3 1" >> ./site.tmp @if test "@enable_plugin@" = "yes" ; then \ - echo "set ENABLE_PLUGIN 1" >> ./tmp0; \ - echo "set PLUGINCC \"$(PLUGINCC)\"" >> ./tmp0; \ - echo "set PLUGINCFLAGS \"$(PLUGINCFLAGS)\"" >> ./tmp0; \ - echo "set GMPINC \"$(GMPINC)\"" >> ./tmp0; \ + echo "set ENABLE_PLUGIN 1" >> ./site.tmp; \ + echo "set PLUGINCC \"$(PLUGINCC)\"" >> ./site.tmp; \ + echo "set PLUGINCFLAGS \"$(PLUGINCFLAGS)\"" >> ./site.tmp; \ + echo "set GMPINC \"$(GMPINC)\"" >> ./site.tmp; \ fi @if test "@enable_lto@" = "yes" ; then \ - echo "set ENABLE_LTO 1" >> ./tmp0; \ + echo "set ENABLE_LTO 1" >> ./site.tmp; \ fi # If newlib has been configured, we need to pass -B to gcc so it can find # newlib's crt0.o if it exists. This will cause a "path prefix not used" @@ -4893,36 +4893,36 @@ site.exp: ./config.status Makefile # We also need to pass -L ../ld so that the linker can find ldscripts. @if [ -d $(objdir)/../$(target_subdir)/newlib ] \ && [ "${host}" != "${target}" ]; then \ - echo "set newlib_cflags \"-I$(objdir)/../$(target_subdir)/newlib/targ-include -I\$$srcdir/../newlib/libc/include\"" >> ./tmp0; \ - echo "set newlib_ldflags \"-B$(objdir)/../$(target_subdir)/newlib/\"" >> ./tmp0; \ - echo "append CFLAGS \" \$$newlib_cflags\"" >> ./tmp0; \ - echo "append CXXFLAGS \" \$$newlib_cflags\"" >> ./tmp0; \ - echo "append LDFLAGS \" \$$newlib_ldflags\"" >> ./tmp0; \ + echo "set newlib_cflags \"-I$(objdir)/../$(target_subdir)/newlib/targ-include -I\$$srcdir/../newlib/libc/include\"" >> ./site.tmp; \ + echo "set newlib_ldflags \"-B$(objdir)/../$(target_subdir)/newlib/\"" >> ./site.tmp; \ + echo "append CFLAGS \" \$$newlib_cflags\"" >> ./site.tmp; \ + echo "append CXXFLAGS \" \$$newlib_cflags\"" >> ./site.tmp; \ + echo "append LDFLAGS \" \$$newlib_ldflags\"" >> ./site.tmp; \ else true; \ fi @if [ -d $(objdir)/../ld ] ; then \ - echo "append LDFLAGS \" -L$(objdir)/../ld\"" >> ./tmp0; \ + echo "append LDFLAGS \" -L$(objdir)/../ld\"" >> ./site.tmp; \ else true; \ fi - echo "set tmpdir $(objdir)/testsuite" >> ./tmp0 - @echo "set srcdir \"\$${srcdir}/testsuite\"" >> ./tmp0 + echo "set tmpdir $(objdir)/testsuite" >> ./site.tmp + @echo "set srcdir \"\$${srcdir}/testsuite\"" >> ./site.tmp @if [ "X$(ALT_CC_UNDER_TEST)" != "X" ] ; then \ - echo "set ALT_CC_UNDER_TEST \"$(ALT_CC_UNDER_TEST)\"" >> ./tmp0; \ + echo "set ALT_CC_UNDER_TEST \"$(ALT_CC_UNDER_TEST)\"" >> ./site.tmp; \ else true; \ fi @if [ "X$(ALT_CXX_UNDER_TEST)" != "X" ] ; then \ - echo "set ALT_CXX_UNDER_TEST \"$(ALT_CXX_UNDER_TEST)\"" >> ./tmp0; \ + echo "set ALT_CXX_UNDER_TEST \"$(ALT_CXX_UNDER_TEST)\"" >> ./site.tmp; \ else true; \ fi @if [ "X$(COMPAT_OPTIONS)" != "X" ] ; then \ - echo "set COMPAT_OPTIONS \"$(COMPAT_OPTIONS)\"" >> ./tmp0; \ + echo "set COMPAT_OPTIONS \"$(COMPAT_OPTIONS)\"" >> ./site.tmp; \ else true; \ fi - @echo "## All variables above are generated by configure. Do Not Edit ##" >> ./tmp0 - @cat ./tmp0 > site.exp + @echo "## All variables above are generated by configure. Do Not Edit ##" >> ./site.tmp + @cat ./site.tmp > site.exp @cat site.bak | sed \ -e '1,/^## All variables above are.*##/ d' >> site.exp - -@rm -f ./tmp? + -@rm -f ./site.tmp CHECK_TARGETS = check-gcc @check_languages@ -- 2.30.2