Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

relocation issues with clang on 32bit FreeBSD #10835

Merged
merged 3 commits into from
Feb 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions Changes
Expand Up @@ -377,6 +377,11 @@ OCaml 4.14.0

### Build system:

- #10835 Disable DT_TEXTREL warnings on x86 32 bit architecture by passing
-Wl,-z,notext in mksharedlib and mkmaindll. Fixes relocation issues, reported
in #9800, making local patches in Debian, Alpine, and FreeBSD superfluous.
(Hannes Mehnert with Kate Deplaix and Stéphane Glondu, review by Xavier Leroy)

- #10717: Simplify the installation of man pages
(Sébastien Hinderer, review by David Allsopp)

Expand Down
4 changes: 4 additions & 0 deletions configure

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions configure.ac
Expand Up @@ -983,6 +983,10 @@ AS_IF([test x"$enable_shared" != "xno"],
AS_CASE([$cc_basename,$host],
[*gcc*,powerpc-*-linux*],
[mksharedlib="$CC -shared -mbss-plt \$(LDFLAGS)"],
[[*,i[3456]86-*]],
# Disable DT_TEXTREL warnings on Linux and BSD i386
# See https://github.com/ocaml/ocaml/issues/9800
[mksharedlib="$CC -shared \$(LDFLAGS) -Wl,-z,notext"],
[mksharedlib="$CC -shared \$(LDFLAGS)"])
oc_ldflags="$oc_ldflags -Wl,-E"
rpath="-Wl,-rpath,"
Expand Down