View | Details | Raw Unified | Return to bug 261180 | Differences between
and this patch

Collapse All | Expand All

(-)src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch (+60 lines)
Line 0 Link Here
1 
diff --git a/configure b/configure
2 
index b1e287aed..4754e8ab2 100755
3 
--- a/configure
4 
+++ b/configure
5 
@@ -13901,6 +13901,8 @@ fi; system=elf ;; #(
6 
     arch=arm; model=armv6; system=linux_eabi ;; #(
7 
   armv6*-*-freebsd*) :
8 
     arch=arm; model=armv6; system=freebsd ;; #(
9 
+  armv7*-*-freebsd*) :
10 
+    arch=arm; model=armv7; system=freebsd ;; #(
11 
   earmv6*-*-netbsd*) :
12 
     arch=arm; model=armv6; system=netbsd ;; #(
13 
   earmv7*-*-netbsd*) :
14 
@@ -14120,6 +14122,17 @@ case $arch in #(
15 
 esac ;;
16 
 esac
17
18 
+# Disable DT_TEXTREL warnings
19 
+# See https://github.com/ocaml/ocaml/issues/9800
20 
+
21 
+case "$arch,$system" in #(
22 
+  *,linux_elf|*,bsd_elf|arm,freebsd) :
23 
+    mksharedlib="$mksharedlib -Wl,-z,notext"
24 
+    mkmaindll="$mkmaindll -Wl,-z,notext" ;; #(
25 
+  *) :
26 
+     ;;
27 
+esac
28 
+
29 
 # Assembler
30
31 
 if test -n "$host_alias"; then :
32 
diff --git a/configure.ac b/configure.ac
33 
index 656ffe20c..1c9694805 100644
34 
--- a/configure.ac
35 
+++ b/configure.ac
36 
@@ -971,6 +971,8 @@ AS_CASE([$host],
37 
     [arch=arm; model=armv6; system=linux_eabi],
38 
   [armv6*-*-freebsd*],
39 
     [arch=arm; model=armv6; system=freebsd],
40 
+  [armv7*-*-freebsd*],
41 
+    [arch=arm; model=armv7; system=freebsd],
42 
   [earmv6*-*-netbsd*],
43 
     [arch=arm; model=armv6; system=netbsd],
44 
   [earmv7*-*-netbsd*],
45 
@@ -1070,6 +1072,15 @@ AS_CASE([$arch],
46 
        [common_cflags="-no-pie $common_cflags"],
47 
     [])])
48
49 
+# Disable DT_TEXTREL warnings
50 
+# See https://github.com/ocaml/ocaml/issues/9800
51 
+
52 
+AS_CASE(["$arch,$system"],
53 
+  [*,linux_elf|*,bsd_elf|arm,freebsd],
54 
+    [mksharedlib="$mksharedlib -Wl,-z,notext"
55 
+    mkmaindll="$mkmaindll -Wl,-z,notext"],
56 
+  [])
57 
+
58 
 # Assembler
59
60 
 AS_IF([test -n "$host_alias"], [toolpref="${host_alias}-"], [toolpref=""])

Return to bug 261180