configure | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
+diff --git a/configure b/configure
+index e796599..d67672e 100755
--- a/configure
+++ b/configure
-@@ -448,7 +448,8 @@
+@@ -448,7 +448,8 @@ case "$bytecc,$target" in
*gcc*,alpha*-*-linux*)
if cc="$bytecc" sh ./hasgot -mieee; then
bytecccompopts="-mieee $bytecccompopts";
*,mips-*-irix6*)
# Turn off warning "unused library"
bytecclinkopts="-n32 -Wl,-woff,84";;
-@@ -982,6 +983,7 @@
+@@ -982,6 +983,7 @@ nativeccrpath="$byteccrpath"
case "$arch,$nativecc,$system,$model" in
*,*,nextstep,*) nativecclinkopts="-posix";;
*,*,rhapsody,*) if $arch64; then partialld="ld -r -arch ppc64"; fi;;
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/configure b/configure
+index d67672e..c0024a9 100755
--- a/configure
+++ b/configure
-@@ -2049,7 +2049,7 @@
+@@ -2049,7 +2049,7 @@ echo "DYNLINKOPTS=$dllib" >> Makefile
echo "OTHERLIBRARIES=$otherlibraries" >> Makefile
echo "CC_PROFILE=$cc_profile" >> Makefile
echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile
tools/ocamlmklib.ml | 5 +++++
1 file changed, 5 insertions(+)
+diff --git a/tools/ocamlmklib.ml b/tools/ocamlmklib.ml
+index e5dda65..cb9daca 100644
--- a/tools/ocamlmklib.ml
+++ b/tools/ocamlmklib.ml
-@@ -43,6 +43,11 @@
+@@ -43,6 +43,11 @@ and rpath = ref [] (* rpath options *)
and debug = ref false (* -g option *)
and verbose = ref false
ocamldoc/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile
+index f69b874..374d063 100644
--- a/ocamldoc/Makefile
+++ b/ocamldoc/Makefile
-@@ -387,7 +387,7 @@
+@@ -387,7 +387,7 @@ test_texi:
stdlib_man/Pervasives.3o: $(OCAMLDOC) $(STDLIB_MLIS)
$(MKDIR) stdlib_man
$(OCAMLDOC_RUN) -man -d stdlib_man $(INCLUDES) \
bytecomp/symtable.mli | 2 +-
3 files changed, 22 insertions(+), 6 deletions(-)
+diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml
+index 8f82fc9..40a3351 100644
--- a/bytecomp/bytelink.ml
+++ b/bytecomp/bytelink.ml
-@@ -449,6 +449,20 @@
+@@ -449,6 +449,20 @@ let output_cds_file outfile =
remove_file outfile;
raise x
(* Output a bytecode executable as a C file *)
let link_bytecode_as_c ppf tolink outfile =
-@@ -491,7 +505,7 @@
+@@ -491,7 +505,7 @@ let link_bytecode_as_c ppf tolink outfile =
(Marshal.to_string sections []);
output_string outchan "\n};\n\n";
(* The table of primitives *)
(* The entry point *)
output_string outchan "\
\nvoid caml_startup(char ** argv)\
-@@ -587,7 +601,7 @@
+@@ -587,7 +601,7 @@ let link ppf objfiles output_name =
#else\n\
typedef long value;\n\
#endif\n";
output_string poc "\
#ifdef __cplusplus\n\
}\n\
+diff --git a/bytecomp/symtable.ml b/bytecomp/symtable.ml
+index d2936f4..d81ed51 100644
--- a/bytecomp/symtable.ml
+++ b/bytecomp/symtable.ml
-@@ -112,15 +112,17 @@
+@@ -112,15 +112,17 @@ let output_primitive_names outchan =
open Printf
done;
fprintf outchan " (primitive) 0 };\n";
fprintf outchan "const char * caml_names_of_builtin_cprim[] = {\n";
+diff --git a/bytecomp/symtable.mli b/bytecomp/symtable.mli
+index 22dec58..a621ebe 100644
--- a/bytecomp/symtable.mli
+++ b/bytecomp/symtable.mli
-@@ -26,7 +26,7 @@
+@@ -26,7 +26,7 @@ val require_primitive: string -> unit
val initial_global_table: unit -> Obj.t array
val output_global_map: out_channel -> unit
val output_primitive_names: out_channel -> unit
testsuite/tests/backtrace/Makefile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
+diff --git a/testsuite/tests/backtrace/Makefile b/testsuite/tests/backtrace/Makefile
+index 5df19fc..9ad93c3 100644
--- a/testsuite/tests/backtrace/Makefile
+++ b/testsuite/tests/backtrace/Makefile
-@@ -29,7 +29,10 @@
+@@ -29,7 +29,10 @@ LOCATIONFILTER=grep -oE \
default:
@$(MAKE) byte
-Description: Drop a test-suite experiment committed by mistake
- This was failing on armhf because Debian GCC now enables PIE by default.
-Author: Xavier Leroy <xavier.leroy@inria.fr>
+From: Xavier Leroy <xavier.leroy@inria.fr>
+Date: Fri, 25 Jan 2019 13:47:44 +0100
+Subject: Drop a test-suite experiment committed by mistake
+
+This was failing on armhf because Debian GCC now enables PIE by default.
+
Bug: https://caml.inria.fr/mantis/view.php?id=7642
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837359#80
---
+ testsuite/tests/asmcomp/main.ml | 1 -
+ 1 file changed, 1 deletion(-)
+
diff --git a/testsuite/tests/asmcomp/main.ml b/testsuite/tests/asmcomp/main.ml
index 284f7fb..6457ad2 100644
--- a/testsuite/tests/asmcomp/main.ml
-commit 4274dfe22ae37c4c5589a6fe7fe9d53d62013df5
-Author: Mark Shinwell <mshinwell@gmail.com>
-Date: Wed Sep 13 10:23:16 2017 +0100
+From: Mark Shinwell <mshinwell@gmail.com>
+Date: Wed, 13 Sep 2017 10:23:16 +0100
+Subject: arm64-hide-symbols-for-stricter-binutils
AArch64 GOT fixed
+---
+ Changes | 4 ++++
+ asmcomp/arm64/emit.mlp | 15 +++++++++++++--
+ asmcomp/arm64/selection.ml | 4 ++--
+ 3 files changed, 19 insertions(+), 4 deletions(-)
+diff --git a/Changes b/Changes
+index cc59f63..4c0eac7 100644
--- a/Changes
+++ b/Changes
-@@ -135,6 +135,10 @@
+@@ -135,6 +135,10 @@ OCaml 4.05.0 (13 Jul 2017):
(Hannes Mehnert, Guillaume Bury,
review by Daniel Bünzli, Gabriel Scherer, Damien Doligez)
### Standard library:
- MPR#6975, GPR#902: Truncate function added to stdlib Buffer module
+diff --git a/asmcomp/arm64/emit.mlp b/asmcomp/arm64/emit.mlp
+index f75646e..729096c 100644
--- a/asmcomp/arm64/emit.mlp
+++ b/asmcomp/arm64/emit.mlp
-@@ -114,6 +114,7 @@
+@@ -114,6 +114,7 @@ let emit_addressing addr r =
| Iindexed ofs ->
`[{emit_reg r}, #{emit_int ofs}]`
| Ibased(s, ofs) ->
`[{emit_reg r}, #:lo12:{emit_symbol_offset s ofs}]`
(* Record live pointers at call points *)
-@@ -323,7 +324,7 @@
+@@ -323,7 +324,7 @@ let emit_literals() =
(* Emit code to load the address of a symbol *)
let emit_load_symbol_addr dst s =
` adrp {emit_reg dst}, {emit_symbol s}\n`;
` add {emit_reg dst}, {emit_reg dst}, #:lo12:{emit_symbol s}\n`
end else begin
-@@ -609,6 +610,7 @@
+@@ -609,6 +610,7 @@ let emit_instr i =
match addr with
| Iindexed _ -> i.arg.(0)
| Ibased(s, ofs) ->
` adrp {emit_reg reg_tmp1}, {emit_symbol_offset s ofs}\n`;
reg_tmp1 in
begin match size with
-@@ -636,6 +638,7 @@
+@@ -636,6 +638,7 @@ let emit_instr i =
match addr with
| Iindexed _ -> i.arg.(1)
| Ibased(s, ofs) ->
` adrp {emit_reg reg_tmp1}, {emit_symbol_offset s ofs}\n`;
reg_tmp1 in
begin match size with
-@@ -924,7 +927,15 @@
+@@ -924,7 +927,15 @@ let fundecl fundecl =
let emit_item = function
| Cglobal_symbol s -> ` .globl {emit_symbol s}\n`;
| Cint8 n -> ` .byte {emit_int n}\n`
| Cint16 n -> ` .short {emit_int n}\n`
| Cint32 n -> ` .long {emit_nativeint n}\n`
+diff --git a/asmcomp/arm64/selection.ml b/asmcomp/arm64/selection.ml
+index d8ea7f8..b714d00 100644
--- a/asmcomp/arm64/selection.ml
+++ b/asmcomp/arm64/selection.ml
-@@ -82,8 +82,8 @@
+@@ -82,8 +82,8 @@ let inline_ops =
[ "sqrt"; "caml_bswap16_direct"; "caml_int32_direct_bswap";
"caml_int64_direct_bswap"; "caml_nativeint_direct_bswap" ]
Forwarded: no
Last-Update: <2015-07-15>
---
- configure | 2 ++
- tools/Makefile.shared | 2 +-
+ configure | 2 ++
+ tools/Makefile | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
+diff --git a/configure b/configure
+index c0024a9..b8e0bcf 100755
--- a/configure
+++ b/configure
-@@ -815,6 +815,8 @@
+@@ -815,6 +815,8 @@ if test $with_sharedlibs = "yes"; then
shared_libraries_supported=true;;
esac
fi
if test -z "$mkmaindll"; then
mkmaindll=$mksharedlib
+diff --git a/tools/Makefile b/tools/Makefile
+index 9a8cf65..2d19c65 100644
--- a/tools/Makefile
+++ b/tools/Makefile
-@@ -316,7 +316,7 @@
+@@ -316,7 +316,7 @@ endif
objinfo_helper$(EXE): objinfo_helper.c ../config/s.h
$(BYTECC) $(CCOUT)objinfo_helper$(EXE) $(BYTECCCOMPOPTS) \
driver/pparse.ml | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
+diff --git a/driver/pparse.ml b/driver/pparse.ml
+index b00ded4..13d76bc 100644
--- a/driver/pparse.ml
+++ b/driver/pparse.ml
-@@ -21,10 +21,19 @@
+@@ -21,10 +21,19 @@ type error =
exception Error of error
projects / ocaml.git / commitdiff