This is an archive of the discontinued LLVM Phabricator instance.

Differential D40075

[test-suite] Fix unix-smail symbol clash with the symbols in libc when linking statically.
ClosedPublic

Authored by mstojanovic on Nov 15 2017, 6:18 AM.

Details

Reviewers
zoran.jovanovic
petarj
MatzeB
joelkevinjones
joel_k_jones
Commits
rOLDT318521: [test-suite] fix unix-smail test issue when linking statically
rL318521: [test-suite] fix unix-smail test issue when linking statically
Summary

Test unix-smail fails when compiling with --static flag. Adding a prefix to getopt, optind and opterr in order to avoid clashing with libc while linking.

Diff Detail

Event Timeline

mstojanovic created this revision.Nov 15 2017, 6:18 AM
petarj added reviewers: MatzeB, joelkevinjones, joel_k_jones.Nov 15 2017, 3:04 PM
MatzeB edited edge metadata.Nov 15 2017, 4:14 PM

Does this work with all linkers? I don't see this document in the manpage of apples ld64.

MatzeB added a comment.Nov 15 2017, 4:16 PM

I'd be fine with renaming the functions in the benchmark.

mstojanovic added a comment.Nov 16 2017, 3:14 AM

This was only tested with gcc for mips and x86_64 but renaming the function and the variables would be a more general solution.

joelkevinjones edited edge metadata.Nov 16 2017, 6:54 AM

Since I don't perceive a requirement that the benchmark source continue to exactly match that of the original, I would prefer just changing the benchmark source to not conflict.

mstojanovic updated this revision to Diff 123182.Nov 16 2017, 7:53 AM
mstojanovic retitled this revision from [test-suite] Fix symbol clash of getopt, optind, opterr with the symbols in libc when linking statically. to [test-suite] Fix unix-smail symbol clash with the symbols in libc when linking statically..
mstojanovic edited the summary of this revision. (Show Details)

Added unix-smail_ prefix to function getopt and variables optind and opterr.

MatzeB accepted this revision.Nov 16 2017, 5:20 PM

LGTM, thanks.

This revision is now accepted and ready to land.Nov 16 2017, 5:20 PM
Closed by commit rL318521: [test-suite] fix unix-smail test issue when linking statically (authored by petarj). · Explain WhyNov 17 2017, 4:14 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
MultiSource/
Benchmarks/
Prolangs-C/
unix-smail/
1 line

Diff 123018

MultiSource/Benchmarks/Prolangs-C/unix-smail/Makefile

LEVEL = ../../../.. LEVEL = ../../../..
PROG = unix-smail PROG = unix-smail
LDFLAGS = -Wl,--allow-multiple-definition
RUN_OPTIONS = -v ALL RUN_OPTIONS = -v ALL
STDIN_FILENAME = $(PROJ_SRC_DIR)/main.c STDIN_FILENAME = $(PROJ_SRC_DIR)/main.c
include $(LEVEL)/MultiSource/Makefile.multisrc include $(LEVEL)/MultiSource/Makefile.multisrc