Skip to content

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Jan 3, 2024

Followup to #28459. Add a sanity check that bti instructions are present in the arm macho binary, similar to our x86_64 check for control flow.

Could do something similar for aarch64 linux in future, and maybe could use lief-project/LIEF#975.

@DrahtBot
Copy link
Contributor

DrahtBot commented Jan 3, 2024

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK TheCharlatan

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

@DrahtBot
Copy link
Contributor

DrahtBot commented Jan 4, 2024

Guix builds (on x86_64)

File commit 65c05db
(master)
commit fa783cc
(master and this pull)
SHA256SUMS.part d97ad5d47c095d44... 8097c4d0202e874a...
*-aarch64-linux-gnu-debug.tar.gz c3db617f3148f66f... d44cb3109a7d6010...
*-aarch64-linux-gnu.tar.gz b2cf69e9adb2ed95... 943c1b2b015df3b0...
*-arm-linux-gnueabihf-debug.tar.gz 924b3b035081a1df... e3d241e6b101d62f...
*-arm-linux-gnueabihf.tar.gz 086a7297ab18d363... 57ac128bf25ecfe8...
*-arm64-apple-darwin-unsigned.tar.gz 7fb7559d02277a55... 039e2ca8fafbb087...
*-arm64-apple-darwin-unsigned.zip 4de0cca0c1ad3765... 1449351fe08851cb...
*-arm64-apple-darwin.tar.gz ef3406f2e73ac212... ee6deeb0f28cc36e...
*-powerpc64-linux-gnu-debug.tar.gz 7d4f91457cf2b2fb... 5286923bccec7fd3...
*-powerpc64-linux-gnu.tar.gz 001a8faa69f350c8... 336b91970cd87cb6...
*-powerpc64le-linux-gnu-debug.tar.gz 8cc12ee8e740aa9b... e470f06ca7af7fe6...
*-powerpc64le-linux-gnu.tar.gz b0b5df8e35ce5d72... 32ed5350320125fc...
*-riscv64-linux-gnu-debug.tar.gz bf6762a840dc9b6a... 479b06a7c48b9554...
*-riscv64-linux-gnu.tar.gz cb09fb0705923f3e... ff0786ab0bb88ff7...
*-x86_64-apple-darwin-unsigned.tar.gz 388d2d01d87e50c1... 3ff7a2c8804d3886...
*-x86_64-apple-darwin-unsigned.zip 6089e05883e95fa2... 188b486dd569e3bd...
*-x86_64-apple-darwin.tar.gz dc4a5cb0b8bd0c60... 34a11c19374e5406...
*-x86_64-linux-gnu-debug.tar.gz adf8ebf8576ee97d... 2356632c38f996cb...
*-x86_64-linux-gnu.tar.gz 598868ef1a2e0b40... 09cd85473c59bb54...
*.tar.gz 9038887954759e98... db23fbeeeca6a47e...
guix_build.log 7b7f0eee6671ab54... f0a43b6de88bff70...
guix_build.log.diff d26112876bcf58c0...

Copy link
Contributor

@TheCharlatan TheCharlatan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 5335e45

@fanquake fanquake merged commit f1fcc96 into bitcoin:master Jan 16, 2024
@fanquake fanquake deleted the add_macho_branch_protection_check branch January 16, 2024 15:34
kwvg added a commit to kwvg/dash that referenced this pull request Nov 7, 2024
kwvg added a commit to kwvg/dash that referenced this pull request Nov 7, 2024
kwvg added a commit to kwvg/dash that referenced this pull request Nov 15, 2024
kwvg added a commit to kwvg/dash that referenced this pull request Nov 16, 2024
kwvg added a commit to kwvg/dash that referenced this pull request Nov 17, 2024
PastaPastaPasta added a commit to dashpay/dash that referenced this pull request Nov 17, 2024
, bitcoin#28622, bitcoin#28880, bitcoin#29185, bitcoin#29170, bitcoin#29233, bitcoin#29298, bitcoin#29598, bitcoin#29732, bitcoin#29890, bitcoin#29739, bitcoin#30074, bitcoin#30198, bitcoin#29072 (toolchain backports: part 2)

1506d9d merge bitcoin#29072: use `-no_exported_symbols` on macOS (Kittywhiskers Van Gogh)
9247960 merge bitcoin#30198: qt 5.15.14 and fix macOS build with Clang 18 (Kittywhiskers Van Gogh)
5585e7a merge bitcoin#30074: use ENV flags in get_arch (Kittywhiskers Van Gogh)
decd420 merge bitcoin#29739: swap cctools otool for llvm-objdump (Kittywhiskers Van Gogh)
0f8c420 merge bitcoin#29890: remove some tools when cross-compiling for macOS (Kittywhiskers Van Gogh)
936da1a merge bitcoin#29732: qt 5.15.13 (Kittywhiskers Van Gogh)
c294b47 revert: patch qt to make placeholders differ from actual text (Kittywhiskers Van Gogh)
af7090c merge bitcoin#29598: don't use -h with touch on OpenBSD (Kittywhiskers Van Gogh)
ebf8ff2 merge bitcoin#29298: patch libtool out of libnatpmp/miniupnpc (Kittywhiskers Van Gogh)
070b876 merge bitcoin#29233: depends move macOS C(XX) FLAGS out of C & CXX (Kittywhiskers Van Gogh)
d838481 revert dash#2398: Force fvisibility=hidden when compiling on macos (Kittywhiskers Van Gogh)
59a18f9 merge bitcoin#29170: add macho branch protection check (Kittywhiskers Van Gogh)
cb024d9 merge bitcoin#29185: remove `--enable-lto` (Kittywhiskers Van Gogh)
6d75a81 merge bitcoin#28880: switch to using LLVM 17.x for macOS builds (Kittywhiskers Van Gogh)
7b0a1f2 merge bitcoin#28622: use macOS 14 SDK (Xcode 15.0) (Kittywhiskers Van Gogh)
02eb735 merge bitcoin#24948: fix typo in permissions (Kittywhiskers Van Gogh)
2739107 merge bitcoin#24534: make gen-sdk deterministic (Kittywhiskers Van Gogh)
ab10bf9 merge bitcoin#24241: cleanup doc on need of Developer Account to obtain macOS SDK (Kittywhiskers Van Gogh)

Pull request description:

  ## Additional Information

  * Dependent on #6384
  * Dependency for #6389
  * The Qt patch introduced in [dash#5596](#5596), `fix_qt_placeholders.patch`, was a portion of a suggested workaround for QTBUG-92199 ([source](https://bugreports.qt.io/browse/QTBUG-92199?focusedId=669719&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-669719)) but since then, a fix ([here](https://codereview.qt-project.org/c/qt/qtbase/+/434310)) has made its way to 5.15.12 and we are upgrading to 5.15.14 from 5.15.11.

    So we can safely remove this patch.

  ## Breaking Changes

  None expected

  ## Checklist

  - [x] I have performed a self-review of my own code
  - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)**
  - [x] I have added or updated relevant unit/integration/functional/e2e tests
  - [x] I have made corresponding changes to the documentation **(note: N/A)**
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  UdjinM6:
    utACK 1506d9d
  PastaPastaPasta:
    utACK 1506d9d

Tree-SHA512: df8e4ea0ce9e7b269d248518698f0566b5eca1a54cdfb53f5b213b90fb5177e5a5df44eaeb6f3fc014cd93351c9245736bb2fd52bc2af4ae274d8fa93e601b07
@bitcoin bitcoin locked and limited conversation to collaborators Jan 15, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants