Skip to content

Commit 91a1662

Browse files
committed
Add .type and .size annotations for i686 Linux
We needed to do this for the trampolines in Julia as well. X-ref: JuliaLang/julia#40575
1 parent 8b85b22 commit 91a1662

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

.buildkite/instantiate_and_test.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
#!/usr/bin/env bash
2-
#set -euo pipefail
3-
4-
echo "+++ DEBUG"
5-
echo "PATH=$PATH"
6-
ls -la /c/buildkite-agent
2+
set -euo pipefail
73

84
julia --project=test -e 'import Pkg; Pkg.instantiate()'
95
echo '+++ runtests.jl'

.buildkite/test_linux.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
steps:
22
- label: ":julia: :linux: ${ARCH?} Julia ${JULIA_VERSION?}"
33
plugins:
4+
# Install Julia for the agent first, so that we can run `sandbox`
45
- JuliaCI/julia#v1:
5-
version: "${JULIA_VERSION?}"
6-
arch: "${ARCH?}"
6+
version: "1"
7+
arch: "${AGENT_ARCH?}"
78
- staticfloat/sandbox#v1:
89
rootfs_url: "${ROOTFS_URL?}"
910
rootfs_treehash: "${ROOTFS_HASH?}"
1011
uid: 0
1112
gid: 0
1213
workspaces:
1314
- "/cache:/cache"
15+
# Then install Julia for the rootfs arch
16+
- JuliaCI/julia#v1:
17+
version: "${JULIA_VERSION?}"
18+
arch: "${ARCH?}"
1419
- staticfloat/metahook#sf/windows_backslashes:
1520
pre-command: |
1621
# Upgrade our debian package to bullseye (wowza) and get an ILP64 blas

.buildkite/test_windows.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ steps:
33
plugins:
44
- JuliaCI/julia#v1:
55
version: "${JULIA_VERSION?}"
6+
arch: "${ARCH?}"
67
- staticfloat/metahook#sf/windows_backslashes:
78
# Copy our julia installation to a known location that we can mount with docker
89
pre-command: |

src/trampolines/common.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
.ascii STR(-export:##I(MANGLE(name))); \
2626
.ascii " "; \
2727
.section .text
28+
#elif defined(__ELF__)
29+
#define DEBUGINFO(name) .type UNDERSCORE(MANGLE(name)),@function
30+
#define EXPORT(name) .size UNDERSCORE(MANGLE(name)), . - UNDERSCORE(MANGLE(name))
2831
#else
2932
#define DEBUGINFO(name)
3033
#define EXPORT(name)

0 commit comments

Comments
 (0)