diff options
| author | Sverker Eriksson <[email protected]> | 2015-08-31 16:59:13 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-08-31 16:59:13 +0200 |
| commit | 3af9e6ef9bd6a9e9faf0e5bf683f4f1c5c0c0ca9 (patch) | |
| tree | cb9bae63100a58fd18d04744acfda216acb244f0 /lib/hipe/llvm/hipe_llvm_merge.erl | |
| parent | bf9b55d9341ca6e1bbb8c1d2c2763b17538426b6 (diff) | |
| parent | 6e3a0870ebd992ed410298e859066894134be9f6 (diff) | |
| download | otp-3af9e6ef9bd6a9e9faf0e5bf683f4f1c5c0c0ca9.tar.gz otp-3af9e6ef9bd6a9e9faf0e5bf683f4f1c5c0c0ca9.tar.bz2 otp-3af9e6ef9bd6a9e9faf0e5bf683f4f1c5c0c0ca9.zip | |
Merge branch 'sverk/hipe-fix-literal-crc' into maint
* sverk/hipe-fix-literal-crc:
erts,hipe,dialyzer: Fix hipe checkum of target runtime system
erts: Change THE_NON_VALUE to not be hard coded in hipe compiler
OTP-12962
OTP-12963
OTP-12964
Diffstat (limited to 'lib/hipe/llvm/hipe_llvm_merge.erl')
| -rw-r--r-- | lib/hipe/llvm/hipe_llvm_merge.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/hipe/llvm/hipe_llvm_merge.erl b/lib/hipe/llvm/hipe_llvm_merge.erl index 3ababfc21a..6e891ac3b0 100644 --- a/lib/hipe/llvm/hipe_llvm_merge.erl +++ b/lib/hipe/llvm/hipe_llvm_merge.erl @@ -27,7 +27,7 @@ finalize(CompiledCode, Closures, Exports) -> DataRelocs = hipe_pack_constants:mk_data_relocs(RefsFromConsts, LabelMap), SSE = hipe_pack_constants:slim_sorted_exportmap(ExportMap, Closures, Exports), SlimRefs = hipe_pack_constants:slim_refs(AccRefs), - term_to_binary([{?VERSION_STRING(),?HIPE_SYSTEM_CRC}, + term_to_binary([{?VERSION_STRING(),?HIPE_ERTS_CHECKSUM}, ConstAlign, ConstSize, SC, % ConstMap DataRelocs, % LabelMap |