anchor.diff:  
   %%----------------------------------------------------------------
   %%
  -mk_trampoline_map([], []) -> []; % archs not using trampolines
  -mk_trampoline_map(CalleeMFAs, Trampolines) ->
  -  SizeofLong =
  -    case erlang:system_info(hipe_architecture) of
  -      amd64 -> 8;
  -      ppc64 -> 8;
  -      _ -> 4
  -    end,
  +mk_trampoline_map([], [], _) -> []; % archs not using trampolines
  +mk_trampoline_map(CalleeMFAs, Trampolines, Architecture) ->
  +  SizeofLong = word_size(Architecture),
     mk_trampoline_map(tuple_size(CalleeMFAs), CalleeMFAs,
   		    Trampolines, SizeofLong, gb_trees:empty()).
   
  
positive.code:     x86 ->        ?HX86_TAG  %% HiPE, x86, (implicit: Unix)
      %% Future:     HSV9      %% HiPE, SPARC, V9 (implicit: 64-bit)
      %%             HW32      %% HiPE, x86, Win32 
    end.
  
  %%========================================================================
  
negative.code:       bad_crc;
      true ->
        put(closures_to_patch, []),
        Architecture=erlang:system_info(hipe_architecture),
        WordSize = word_size(Architecture),
        WriteWord = write_word_fun(WordSize),
        %% Create data segment
        {ConstAddr,ConstMap2} =
  	create_data_segment(ConstAlign, ConstSize, ConstMap, WriteWord),
        %% Find callees for which we may need trampolines.
        CalleeMFAs = find_callee_mfas(Refs, Architecture),
        %% Write the code to memory.
        {CodeAddress,Trampolines} =
  	enter_code(CodeSize, CodeBinary, CalleeMFAs, Mod, Beam),
        %% Construct CalleeMFA-to-trampoline mapping.
        TrampolineMap = mk_trampoline_map(CalleeMFAs, Trampolines,
                                          Architecture),
        %% Patch references to code labels in data seg.
        ok = patch_consts(LabelMap, ConstAddr, CodeAddress, WriteWord),
        %% Find out which functions are being loaded (and where).
        %% Note: Addresses are sorted descending.
        {MFAs,Addresses} = exports(ExportMap, CodeAddress),
  