OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

d: Generate phony targets for content imported files (PR93038) 

This is in addition to the last change which started including them in
the make dependency list.

gcc/d/ChangeLog:

2020-03-22  Iain Buclaw  <ibuclaw@gdcproject.org>

	PR d/93038
	* d-lang.cc (deps_write): Generate phony targets for content imported
	files.

gcc/testsuite/ChangeLog:

2020-03-22  Iain Buclaw  <ibuclaw@gdcproject.org>

	PR d/93038
	* gdc.dg/pr93038b.d: New test.
This commit is contained in:
Iain Buclaw 2020-03-22 13:11:10 +01:00
parent 85e10e4f0f
commit fbe60463bb
4 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/d/ChangeLog
View File

@ -1,3 +1,9 @@
2020-03-22 Iain Buclaw <ibuclaw@gdcproject.org>
PR d/93038
* d-lang.cc (deps_write): Generate phony targets for content imported
files.
2020-03-22 Iain Buclaw <ibuclaw@gdcproject.org>
PR d/93038

39
gcc/d/d-lang.cc
View File

@ -157,26 +157,21 @@ deps_write (Module *module, OutBuffer *buffer, unsigned colmax = 72)
Modules modlist;
modlist.push (module);
Modules phonylist;
const char *str;
unsigned size;
vec <const char *> phonylist = vNULL;
unsigned column = 0;
/* Write out make target module name. */
if (d_option.deps_target)
{
size = d_option.deps_target->offset;
str = d_option.deps_target->extractString ();
buffer->writestring (d_option.deps_target->extractString ());
column = d_option.deps_target->offset;
}
else
{
str = module->objfile->name->str;
size = strlen (str);
buffer->writestring (module->objfile->name->str);
column = buffer->offset;
}
buffer->writestring (str);
column = size;
buffer->writestring (":");
column++;
@ -185,21 +180,25 @@ deps_write (Module *module, OutBuffer *buffer, unsigned colmax = 72)
{
Module *depmod = modlist.pop ();
str = depmod->srcfile->name->str;
const char *modstr = depmod->srcfile->name->str;
/* Skip modules that have already been looked at. */
if (seen_modules.add (str))
if (seen_modules.add (modstr))
continue;
dependencies.safe_push (str);
dependencies.safe_push (modstr);
/* Add to list of phony targets if is not being compile. */
if (d_option.deps_phony && !depmod->isRoot ())
phonylist.push (depmod);
phonylist.safe_push (modstr);
/* Add imported files to dependency list. */
for (size_t i = 0; i < depmod->contentImportedFiles.dim; i++)
dependencies.safe_push (depmod->contentImportedFiles[i]);
{
const char *impstr = depmod->contentImportedFiles[i];
dependencies.safe_push (impstr);
phonylist.safe_push (impstr);
}
/* Search all imports of the module. */
for (size_t i = 0; i < depmod->aimports.dim; i++)
@ -238,8 +237,8 @@ deps_write (Module *module, OutBuffer *buffer, unsigned colmax = 72)
/* Write out all make dependencies. */
for (size_t i = 0; i < dependencies.length (); i++)
{
str = dependencies[i];
size = strlen (str);
const char *str = dependencies[i];
unsigned size = strlen (str);
column += size;
if (colmax && column > colmax)
@ -259,12 +258,10 @@ deps_write (Module *module, OutBuffer *buffer, unsigned colmax = 72)
buffer->writenl ();
/* Write out all phony targets. */
for (size_t i = 0; i < phonylist.dim; i++)
for (size_t i = 0; i < phonylist.length (); i++)
{
Module *m = phonylist[i];
buffer->writenl ();
buffer->writestring (m->srcfile->name->str);
buffer->writestring (phonylist[i]);
buffer->writestring (":\n");
}
}

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2020-03-22 Iain Buclaw <ibuclaw@gdcproject.org>
PR d/93038
* gdc.dg/pr93038b.d: New test.
2020-03-22 Iain Sandoe <iain@sandoe.co.uk>
* g++.dg/abi/lambda-vis.C: Amend assembler match

8
gcc/testsuite/gdc.dg/pr93038b.d Normal file
View File

@ -0,0 +1,8 @@
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93038
// { dg-options "-J $srcdir/gdc.dg/fileimports -MMD -MP" }
// { dg-do compile }
// { dg-final { scan-file pr93038b.deps "pr93038b.o: \[^\n\]*/pr93038b.d \[ \\\\\n\]*\[^\n\]*/fileimports/pr93038.txt\n\n\[^\n\]*/fileimports/pr93038.txt:" } }
// { dg-final { file delete pr93038b.deps } }
module pr93038b;
const VERSION = import("pr93038.txt");