d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Take LINKER_FREEBSD_VERSION from numerical field after dash

Browse Source 
Summary:
With COMPILER_FREEBSD_VERSION, we use a numeric value that we bump each
time we make a change that requires re-bootstrapping, but with the
linker variant, we instead take the entire part after "FreeBSD", as in
this example version output:

LLD 9.0.1 (FreeBSD c1a0a213378a458fbea1a5c77b315c7dce08fd05-1300006) (compatible with GNU linkers)

E.g., LINKER_FREEBSD_VERSION is currently being set to
"c1a0a213378a458fbea1a5c77b315c7dce08fd05-1300006".  This means that
*any* new upstream lld version will cause re-bootstrapping.

We should only look at the numerical field we append after a dash
instead.  This review attempts to make it so.

The only thing I am not happy about is the post-processing of awk output
in Makefile.inc1.  I notice that our awk does not have gensub(), so it
can't substitute a numbered sub-regex with \1, \2, etc.  Suggestions
welcome. :)

MFC after:	1 week
Differential Revision: https://reviews.freebsd.org/D23691
This commit is contained in:
Dimitry Andric 2020-02-19 21:12:59 +00:00
parent 1ddda2eb24
commit eb834d9f1b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.inc1
View File

@ -272,9 +272,10 @@ WANT_LINKER_TYPE=
!make(test-system-compiler) !make(test-system-compiler)
.if ${WANT_LINKER_TYPE} == "lld" .if ${WANT_LINKER_TYPE} == "lld"
WANT_LINKER_FREEBSD_VERSION_FILE= lib/clang/include/VCSVersion.inc WANT_LINKER_FREEBSD_VERSION_FILE= lib/clang/include/VCSVersion.inc
WANT_LINKER_FREEBSD_VERSION!= \ _WANT_LINKER_FREEBSD_VERSION!= \
awk '$$2 == "LLD_REVISION" {gsub(/"/, "", $$3); print $$3}' \ awk '$$2 == "LLD_REVISION" {gsub(/"/, "", $$3); print $$3}' \
${SRCDIR}/${WANT_LINKER_FREEBSD_VERSION_FILE} || echo unknown ${SRCDIR}/${WANT_LINKER_FREEBSD_VERSION_FILE} || echo unknown
WANT_LINKER_FREEBSD_VERSION=${_WANT_LINKER_FREEBSD_VERSION:C/.*-(.*)/\1/}
WANT_LINKER_VERSION_FILE= lib/clang/include/lld/Common/Version.inc WANT_LINKER_VERSION_FILE= lib/clang/include/lld/Common/Version.inc
WANT_LINKER_VERSION!= \ WANT_LINKER_VERSION!= \
awk '$$2 == "LLD_VERSION" {split($$3, a, "."); print a[1] * 10000 + a[2] * 100 + a[3]}' \ awk '$$2 == "LLD_VERSION" {split($$3, a, "."); print a[1] * 10000 + a[2] * 100 + a[3]}' \

8
share/mk/bsd.linker.mk
View File

@ -69,9 +69,11 @@ _v= ${_ld_version:M[1-9]*.[0-9]*:[1]}
.elif ${_ld_version:[1]} == "LLD" .elif ${_ld_version:[1]} == "LLD"
${X_}LINKER_TYPE= lld ${X_}LINKER_TYPE= lld
_v= ${_ld_version:[2]} _v= ${_ld_version:[2]}
${X_}LINKER_FREEBSD_VERSION!= \ .if ${_ld_version:[3]} == "(FreeBSD"
${${ld}} --version | \ ${X_}LINKER_FREEBSD_VERSION:= ${_ld_version:[4]:C/.*-(.*)\)/\1/}
awk '$$3 ~ /FreeBSD/ {print substr($$4, 1, length($$4)-1)}' .else
${X_}LINKER_FREEBSD_VERSION= 0
.endif
.else .else
.warning Unknown linker from ${ld}=${${ld}}: ${_ld_version}, defaulting to bfd .warning Unknown linker from ${ld}=${${ld}}: ${_ld_version}, defaulting to bfd
${X_}LINKER_TYPE= bfd ${X_}LINKER_TYPE= bfd