Create files.x86
ClosedPublic
Actions

Authored by imp on Aug 10 2019, 10:39 PM.

Details

Reviewers

jhb
cem

Commits

rS350965: Create files.x86

Summary

files.x86 is for the parts of the system that are common to both i386 and amd64
due too their nature. First up, to get the ball rolling, is fdc, the floppy disk
support. It works only on amd64 and i386 these days, and that's unlikely to
change.

Diff Detail

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 25810
Build 24382: arc lint + arc unit

Event Timeline

imp created this revision.Aug 10 2019, 10:39 PM

Harbormaster completed remote builds in B25780: Diff 60640.Aug 10 2019, 10:39 PM

This commit is purposely thin to get the framework up and going so we can focus on framework issues.

LGTM if it works (is fdc in GENERIC?)

This revision is now accepted and ready to land.Aug 10 2019, 11:30 PM

Ah, I had thought we would use 'include' in files.i386 and files.amd64 rather than DEFAULTS, but either way is fine with me.

In D21210#461467, @jhb wrote:

Ah, I had thought we would use 'include' in files.i386 and files.amd64 rather than DEFAULTS, but either way is fine with me.

I would have, except that no such directive exists inside of files* files. config is annoyingly non-orthogonal.

Oh, I thought it seemed to be there from the code I read on Friday:

static void
read_file(char *fname)
{
...
	/*
	 * include "filename"
	 * filename    [ standard | optional ]
	 *	[ dev* [ | dev* ... ] | profiling-routine ] [ no-obj ]
	 *	[ compile-with "compile rule" [no-implicit-rule] ]
	 *      [ dependency "dependency-list"] [ before-depend ]
	 *	[ clean "file-list"] [ warning "text warning" ]
	 *	[ obj-prefix "file prefix"]
	 */
...
	if (eq(wd, "include")) {
		wd = get_quoted_word(fp);
		if (wd == (char *)EOF || wd == NULL)
			errout("%s: missing include filename.\n", fname);
		(void) snprintf(ifname, sizeof(ifname), "../../%s", wd);
		read_file(ifname);
		while (((wd = get_word(fp)) != (char *)EOF) && wd)
			;
		goto next;
	}

In D21210#461496, @jhb wrote:

Oh, I thought it seemed to be there from the code I read on Friday:

static void
read_file(char *fname)
{
...
	/*
	 * include "filename"
	 * filename    [ standard | optional ]
	 *	[ dev* [ | dev* ... ] | profiling-routine ] [ no-obj ]
	 *	[ compile-with "compile rule" [no-implicit-rule] ]
	 *      [ dependency "dependency-list"] [ before-depend ]
	 *	[ clean "file-list"] [ warning "text warning" ]
	 *	[ obj-prefix "file prefix"]
	 */
...
	if (eq(wd, "include")) {
		wd = get_quoted_word(fp);
		if (wd == (char *)EOF || wd == NULL)
			errout("%s: missing include filename.\n", fname);
		(void) snprintf(ifname, sizeof(ifname), "../../%s", wd);
		read_file(ifname);
		while (((wd = get_word(fp)) != (char *)EOF) && wd)
			;
		goto next;
	}

oh my! It's completely unused in the tree then...

seems to work though, so I'll switch.

Update to use include more directly, per jhb

This revision now requires review to proceed.Aug 12 2019, 6:15 PM

Harbormaster completed remote builds in B25810: Diff 60685.Aug 12 2019, 6:15 PM

jhb accepted this revision.Aug 12 2019, 10:06 PM

This revision is now accepted and ready to land.Aug 12 2019, 10:06 PM

Closed by commit rS350965: Create files.x86 (authored by imp). · Explain WhyAug 12 2019, 10:59 PM

This revision was automatically updated to reflect the committed changes.

imp added a commit: rS350965: Create files.x86.