Fix arm builds of updated libedit
ClosedPublic
Actions

Authored by dim on Sep 14 2019, 10:33 AM.

Details

Reviewers

bapt
emaste
imp

Commits

rS352341: Fix arm and aarch64 builds of libedit after r352275

Summary

On arm and arm64, where chars are unsigned by default, buildworld dies with:

--- terminal.o ---
/usr/src/contrib/libedit/terminal.c:569:41: error: comparison of integers of different signs: 'wint_t' (aka 'int') and 'wchar_t' (aka 'unsigned int') [-Werror,-Wsign-compare]
                                           el->el_cursor.v][where & 0370] !=
                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
/usr/src/contrib/libedit/terminal.c:659:28: error: comparison of integers of different signs: 'wint_t' (aka 'int') and 'wchar_t' (aka 'unsigned int') [-Werror,-Wsign-compare]
                                           [el->el_cursor.h] == MB_FILL_CHAR)
                                           ~~~~~~~~~~~~~~~~~ ^  ~~~~~~~~~~~~
2 errors generated.
*** [terminal.o] Error code 1

Fix this by making MB_FILL_CHAR a wint_t, so no casting is needed.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

No Lint Coverage

Unit

No Test Coverage

Build Status

Buildable 26493
Build 24905: arc lint + arc unit

Event Timeline

dim created this revision.Sep 14 2019, 10:33 AM

Harbormaster completed remote builds in B26493: Diff 62089.Sep 14 2019, 10:33 AM

dim edited the summary of this revision. (Show Details)Sep 14 2019, 10:34 AM

Note that the same patch was provided by @naito.yuichiro_gmail.com in D21584 (and he contacted upstream for it to be committed in.) Please mention him also in the commit log

This revision is now accepted and ready to land.Sep 14 2019, 7:34 PM

Closed by commit rS352341: Fix arm and aarch64 builds of libedit after r352275 (authored by dim). · Explain WhySep 14 2019, 9:49 PM

This revision was automatically updated to reflect the committed changes.

dim added a commit: rS352341: Fix arm and aarch64 builds of libedit after r352275.

bapt mentioned this in rS358113: MFC r352136, r352204, r352275, r352341.Feb 19 2020, 2:49 PM