Page MenuHomeFreeBSD
Differential D17899

Add a top-level target to rebuild all sysent files.
ClosedPublic
Actions

Authored by brooks on Nov 7 2018, 11:25 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Nov 20, 10:20 PM
Unknown Object (File)
Oct 19 2024, 7:28 PM
Unknown Object (File)
Oct 10 2024, 11:50 PM
Unknown Object (File)
Oct 3 2024, 1:14 AM
Unknown Object (File)
Oct 2 2024, 3:18 PM
Unknown Object (File)
Sep 30 2024, 7:39 PM
Unknown Object (File)
Sep 24 2024, 3:18 PM
Unknown Object (File)
Sep 22 2024, 11:05 AM
View All 68 Files
Subscribers
emaste
imp

Details

Reviewers
bdrewery
Commits
rS343595: MFC r340242:
rS343594: MFC r340242:
rS340242: Add a top-level make target to rebuild all sysent files.
Summary

This is useful when changing makesyscalls.sh, when making paired changes
to syscalls.master files, or in a future where freebsd32 sysent entries
are built from the default syscalls.master.

Diff Detail

Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 20697
Build 20110: arc lint + arc unit

Event Timeline

brooks created this revision.Nov 7 2018, 11:25 PM
Herald added a subscriber: emaste. · View Herald TranscriptNov 7 2018, 11:25 PM
Harbormaster completed remote builds in B20694: Diff 50142.Nov 7 2018, 11:25 PM
bdrewery added inline comments.Nov 7 2018, 11:40 PM
Makefile.inc1
303

Why is this line needed but not on MK_SYSTEM_COMPILER logic? Is linker used in make sysent?

brooks marked an inline comment as done.Nov 7 2018, 11:43 PM
brooks added inline comments.
Makefile.inc1
303

Without it I get:

make[1]: "/home/bed22/git/cheribsd/Makefile.inc1" line 336: Malformed conditional (${MK_SYSTEM_LINKER} == "yes" &&  defined(WANT_LINKER_FREEBSD_VERSION) &&  (${MK_LLD_BOOTSTRAP} == "yes") &&  !make(xdev*) &&  ${X_LINKER_TYPE} == ${WANT_LINKER_TYPE} &&  ${X_LINKER_VERSION} == ${WANT_LINKER_VERSION} &&  ${X_LINKER_FREEBSD_VERSION} == ${WANT_LINKER_FREEBSD_VERSION})
make[1]: Fatal errors encountered -- cannot continue
make[1]: stopped in /home/bed22/git/cheribsd
bdrewery added inline comments.Nov 7 2018, 11:48 PM
Makefile.inc1
303

That makes no sense to me. Something else is wrong. I'll apply your patch and check it.
rS339946 is a similar red flag to me.
We shouldn't need to add random targets to this list. xdev is here so the *build* of it does't get infected with system linker behavior. There are some other !make() sprinkled around for the sake of performance but I don't see why make sysent should be needed.

bdrewery added inline comments.Nov 8 2018, 12:05 AM
Makefile.inc1
303

On the latest head, rS340241 I don't get the warning you're seeing.

  • Which revision are you on?
  • Do you have any X* or external toolchain vars set?
brooks marked an inline comment as done.Nov 8 2018, 12:07 AM
brooks added inline comments.
Makefile.inc1
303

Hmm, I didn't check that it was still needed in head. I see it isn't. I'll remove.

brooks updated this revision to Diff 50147.Nov 8 2018, 12:07 AM
  • Remove !make(sysent) conditional not required on FreeBSD.
Harbormaster completed remote builds in B20697: Diff 50147.Nov 8 2018, 12:07 AM
bdrewery requested changes to this revision.Nov 8 2018, 12:18 AM

I don't think this _must_ be in Makefile.inc1 but it's simpler to put it there to ensure the right bmake and share/mk is used, so fine to be there.

Makefile.inc1
1446

Need ${_+_} for submake calls at the start of the line.
It's subtle but makes a difference in terms of make -n and make -N doing what's expected.

~/git/freebsd # git diff sys/kern
diff --git sys/kern/Makefile sys/kern/Makefile
index 21646b451f3b..6d7071f73cbe 100644
--- sys/kern/Makefile
+++ sys/kern/Makefile
@@ -11,6 +11,7 @@ all:

 sysent: init_sysent.c syscalls.c ../sys/syscall.h ../sys/syscall.mk \
 ../sys/sysproto.h
+       @echo HERE

 init_sysent.c syscalls.c systrace_args.c ../sys/syscall.h \
 ../sys/syscall.mk ../sys/sysproto.h: makesyscalls.sh syscalls.master \

Without ${_+_}:

~/git/freebsd # make sysent -n
make -C /root/git/freebsd/sys/kern sysent
make -C /root/git/freebsd/sys/compat/freebsd32 sysent
make -C /root/git/freebsd/sys/i386/ibcs2 sysent
make -C /root/git/freebsd/sys/amd64/linux sysent
make -C /root/git/freebsd/sys/amd64/linux32 sysent
make -C /root/git/freebsd/sys/arm64/linux sysent
make -C /root/git/freebsd/sys/i386/linux sysent

With ${_+_}:

~/git/freebsd # make sysent -n
make -C /root/git/freebsd/sys/kern sysent
echo HERE
make -C /root/git/freebsd/sys/compat/freebsd32 sysent
make -C /root/git/freebsd/sys/i386/ibcs2 sysent
make -C /root/git/freebsd/sys/amd64/linux sysent
make -C /root/git/freebsd/sys/amd64/linux32 sysent
make -C /root/git/freebsd/sys/arm64/linux sysent
make -C /root/git/freebsd/sys/i386/linux sysent

bmake has -N for doing showing only the sub-make calls and not the sub-make -n calls:

~/git/freebsd # make sysent -N
cd /root/git/freebsd; PATH=/sbin:/bin:/usr/sbin:/usr/bin MAKE_CMD="make" make -m /root/git/freebsd/share/mk -f Makefile.inc1  TARGET=amd64 TARGET_ARCH=amd64 MK_AUTO_OBJ=no MK_META_MODE=no sysent
~/git/freebsd # TARGET=amd64 TARGET_ARCH=amd64 make -f Makefile.inc1 sysent -N
make -C /root/git/freebsd/sys/kern sysent
make -C /root/git/freebsd/sys/compat/freebsd32 sysent
make -C /root/git/freebsd/sys/i386/ibcs2 sysent
make -C /root/git/freebsd/sys/amd64/linux sysent
make -C /root/git/freebsd/sys/amd64/linux32 sysent
make -C /root/git/freebsd/sys/arm64/linux sysent
make -C /root/git/freebsd/sys/i386/linux sysent
This revision now requires changes to proceed.Nov 8 2018, 12:18 AM
bdrewery added a comment.Nov 8 2018, 12:18 AM
In D17899#382351, @bdrewery wrote:

I don't think this _must_ be in Makefile.inc1 but it's simpler to put it there to ensure the right bmake and share/mk is used, so fine to be there.

To be clear I'm saying it can stay in Makefile.inc1. I just want to see the ${_+_} fix.

brooks updated this revision to Diff 50149.Nov 8 2018, 12:29 AM
  • Add ${_+_} for submake calls to do the right thing with -n and -N.
Harbormaster completed remote builds in B20699: Diff 50149.Nov 8 2018, 12:29 AM
bdrewery accepted this revision.Nov 8 2018, 12:29 AM

Thanks!

This revision is now accepted and ready to land.Nov 8 2018, 12:29 AM
Closed by commit rS340242: Add a top-level make target to rebuild all sysent files. (authored by brooks). · Explain WhyNov 8 2018, 12:35 AM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: imp. · View Herald TranscriptNov 8 2018, 12:35 AM

Revision Contents
Changeset List

PathSize
2 lines
12 lines

Diff 50147

View Options

Makefile

Loading...
View Options

Makefile.inc1

Loading...