Skip to content

Commit

Permalink
Add .type and .size annotations for i686 Linux
Browse files Browse the repository at this point in the history
We needed to do this for the trampolines in Julia as well.
X-ref: JuliaLang/julia#40575
  • Loading branch information
staticfloat committed Sep 28, 2022
1 parent 8b85b22 commit 91a1662
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
6 changes: 1 addition & 5 deletions .buildkite/instantiate_and_test.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
#!/usr/bin/env bash
#set -euo pipefail

echo "+++ DEBUG"
echo "PATH=$PATH"
ls -la /c/buildkite-agent
set -euo pipefail

julia --project=test -e 'import Pkg; Pkg.instantiate()'
echo '+++ runtests.jl'
Expand Down
9 changes: 7 additions & 2 deletions .buildkite/test_linux.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
steps:
- label: ":julia: :linux: ${ARCH?} Julia ${JULIA_VERSION?}"
plugins:
# Install Julia for the agent first, so that we can run `sandbox`
- JuliaCI/julia#v1:
version: "${JULIA_VERSION?}"
arch: "${ARCH?}"
version: "1"
arch: "${AGENT_ARCH?}"
- staticfloat/sandbox#v1:
rootfs_url: "${ROOTFS_URL?}"
rootfs_treehash: "${ROOTFS_HASH?}"
uid: 0
gid: 0
workspaces:
- "/cache:/cache"
# Then install Julia for the rootfs arch
- JuliaCI/julia#v1:
version: "${JULIA_VERSION?}"
arch: "${ARCH?}"
- staticfloat/metahook#sf/windows_backslashes:
pre-command: |
# Upgrade our debian package to bullseye (wowza) and get an ILP64 blas
Expand Down
1 change: 1 addition & 0 deletions .buildkite/test_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ steps:
plugins:
- JuliaCI/julia#v1:
version: "${JULIA_VERSION?}"
arch: "${ARCH?}"
- staticfloat/metahook#sf/windows_backslashes:
# Copy our julia installation to a known location that we can mount with docker
pre-command: |
Expand Down
3 changes: 3 additions & 0 deletions src/trampolines/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
.ascii STR(-export:##I(MANGLE(name))); \
.ascii " "; \
.section .text
#elif defined(__ELF__)
#define DEBUGINFO(name) .type UNDERSCORE(MANGLE(name)),@function
#define EXPORT(name) .size UNDERSCORE(MANGLE(name)), . - UNDERSCORE(MANGLE(name))
#else
#define DEBUGINFO(name)
#define EXPORT(name)
Expand Down

0 comments on commit 91a1662

Please sign in to comment.