From c85fd25b17ae5b2150c71826b04ffb71045d1b28 Mon Sep 17 00:00:00 2001 From: Steven Bosscher Date: Tue, 19 Jun 2012 20:01:23 +0000 Subject: [PATCH] check_makefile_deps.sh: Look for c-common.o in c-family/. * check_makefile_deps.sh: Look for c-common.o in c-family/. Add a few more crt* files to the list of files to skip. From-SVN: r188792 --- contrib/ChangeLog | 5 +++++ contrib/check_makefile_deps.sh | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 8c21a8a6bad..f0e0e421776 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2012-06-19 Steven Bosscher + + * check_makefile_deps.sh: Look for c-common.o in c-family/. + Add a few more crt* files to the list of files to skip. + 2012-05-31 Marek Polacek * mklog: Prevent printing three spaces after the date. diff --git a/contrib/check_makefile_deps.sh b/contrib/check_makefile_deps.sh index 60b9c1757fd..74dde333d95 100644 --- a/contrib/check_makefile_deps.sh +++ b/contrib/check_makefile_deps.sh @@ -19,7 +19,7 @@ start_after= # Skip some objects unconditionally; make sure each name in this list is # surrounded by spaces. -skip=" crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o crtfastmath.o crtprec64.o crtprec80.o crtprec32.o " +skip=" crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o crtfastmath.o crtprec64.o crtprec80.o crtprec32.o ecrti.o ecrtn.o ncrti.o ncrtn.o " # Files which show up as dependencies other than through unconditional #include. # This is an egrep pattern. @@ -34,7 +34,7 @@ hidden_dep_files='(BASE-VER|DATESTAMP|DEV-PHASE|Makefile|xcoffout\.h|basic-block set -e st=0 -if test -f c-common.o; then :; else +if test -f c-family/c-common.o; then :; else echo "$0: rerun in an up to date build-tree/gcc directory" >&2 exit 1 fi -- 2.30.2