Page MenuHomeFreeBSD
Differential D53986

sys/_types.h: Actually unbreak gcc build
ClosedPublic
Actions

Authored by des on Sat, Nov 29, 9:50 AM.
Tags
None
Referenced Files
F138805618: D53986.id167312.diff
Thu, Dec 4, 8:36 PM
Unknown Object (File)
Sun, Nov 30, 11:23 PM
Subscribers
eduardo
imp
markj

Details

Reviewers
brooks
dim
emaste
Group Reviewers
srcmgr
Commits
rG029a09f18032: sys/_types.h: Actually unbreak gcc build
Summary

Fixes: 19728f31ae42 ("sys/_types.h: Unbreak gcc build")

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

des created this revision.Sat, Nov 29, 9:50 AM
Herald added a subscriber: imp. · View Herald TranscriptSat, Nov 29, 9:50 AM
des requested review of this revision.Sat, Nov 29, 9:50 AM
Harbormaster completed remote builds in B68935: Diff 167279.Sat, Nov 29, 9:50 AM
des added a comment.Sat, Nov 29, 10:21 AM

So I checked and the preprocessor _does_ do short-circuit evaluation of boolean expressions, so this shouldn't be necessary, yet gcc complains:

sys/sys/_types.h:164:46: error: missing binary operator before token "("
  164 | #if !defined(__has_feature) || !__has_feature(capabilities)
      |                                              ^
des edited the summary of this revision. (Show Details)Sat, Nov 29, 10:21 AM
eduardo added a subscriber: eduardo.Sat, Nov 29, 11:01 AM
markj added a subscriber: markj.Sat, Nov 29, 1:30 PM
markj added inline comments.
sys/sys/_types.h
167

Why not just write

#ifdef __has_feature
#if !__has_feature(capabilities)

?

With that change, the gcc13 build completes successfully for me.

des added inline comments.Sat, Nov 29, 3:37 PM
sys/sys/_types.h
167

Because that inverts the logic. We want these lines included in all cases /except/ when the compiler has the capabilities feature.

des marked an inline comment as done.Sat, Nov 29, 3:38 PM
emaste accepted this revision as: emaste.Sat, Nov 29, 9:22 PM
This revision is now accepted and ready to land.Sat, Nov 29, 9:22 PM
Closed by commit rG029a09f18032: sys/_types.h: Actually unbreak gcc build (authored by des). · Explain WhySun, Nov 30, 10:31 AM
This revision was automatically updated to reflect the committed changes.
des added a commit: rG029a09f18032: sys/_types.h: Actually unbreak gcc build.
brooks added a reverting change: D54009: sys/_types.h: avoid use of __has_feature().Mon, Dec 1, 10:59 AM

Revision Contents
Changeset List

PathSize
sys/
sys/
5 lines

Diff 167312

View Options

sys/sys/_types.h

Loading...