This revision separates the changes to readobj that enable the watermark note section to be dumped, see , [[ https://reviews.llvm.org/D66426 | D66426 ]]. I will shortly remove the readobj modifications in that revision with an update.
I intend a future separate revision that will extend readobj to also compute the watermark hash so that this can be checked against the hash present in the note section.