Skip to content

Commit 3039b7c

Browse files
authored
Merge pull request #355 from NixOS/ci
llvm/openbsd fixes
2 parents ec1e840 + a402714 commit 3039b7c

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

tests/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ libbar_scoped_so_LDFLAGS = $(LDFLAGS_sharedlib)
129129
libsimple_so_SOURCES = simple.c
130130
libsimple_so_LDFLAGS = $(LDFLAGS_sharedlib)
131131

132-
libtoomanystrtab_so_SOURCES = too-many-strtab.c
132+
too_many_strtab_SOURCES = too-many-strtab.c too-many-strtab2.s
133+
libtoomanystrtab_so_SOURCES = too-many-strtab.c too-many-strtab2.s
133134
libtoomanystrtab_so_LDFLAGS = $(LDFLAGS_sharedlib)
134135

135136
no_rpath_SOURCES = no-rpath.c

tests/grow-file.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ mkdir -p ${SCRATCH}
88
cp simple-pie ${SCRATCH}/simple-pie
99

1010
# Add a 40MB rpath
11-
head -c 40000000 /dev/urandom > ${SCRATCH}/foo.bin
11+
tr -cd 'a-z0-9' < /dev/urandom | dd count=40 bs=1000000 > ${SCRATCH}/foo.bin
1212

1313
# Grow the file
1414
../src/patchelf --add-rpath @${SCRATCH}/foo.bin ${SCRATCH}/simple-pie

tests/too-many-strtab.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
const int __attribute__((section (".shstrtab"))) lel = 42;
2-
3-
int main(){return 0;}
1+
int main(){ return 0; }

tests/too-many-strtab2.s

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/*
2+
* Create additional .shstrtab section
3+
*/
4+
.section ".shstrtab", "", %3
5+
.byte 0

0 commit comments

Comments
 (0)