Mon Jul 9 12:15:31 2018 UTC ()
FIx reproducible builds for EFI boot blocks (from HEAD)


(christos)
diff -r1.5 -r1.6 src/external/gpl3/binutils.old/dist/bfd/peXXigen.c

cvs diff -r1.5 -r1.6 src/external/gpl3/binutils.old/dist/bfd/peXXigen.c (expand / switch to unified diff)

--- src/external/gpl3/binutils.old/dist/bfd/peXXigen.c 2018/04/14 15:49:39 1.5
+++ src/external/gpl3/binutils.old/dist/bfd/peXXigen.c 2018/07/09 12:15:31 1.6
@@ -869,26 +869,28 @@ _bfd_XXi_only_swap_filehdr_out (bfd * ab @@ -869,26 +869,28 @@ _bfd_XXi_only_swap_filehdr_out (bfd * ab
869 filehdr_in->pe.dos_message[11] = 0x20534f44; 869 filehdr_in->pe.dos_message[11] = 0x20534f44;
870 filehdr_in->pe.dos_message[12] = 0x65646f6d; 870 filehdr_in->pe.dos_message[12] = 0x65646f6d;
871 filehdr_in->pe.dos_message[13] = 0x0a0d0d2e; 871 filehdr_in->pe.dos_message[13] = 0x0a0d0d2e;
872 filehdr_in->pe.dos_message[14] = 0x24; 872 filehdr_in->pe.dos_message[14] = 0x24;
873 filehdr_in->pe.dos_message[15] = 0x0; 873 filehdr_in->pe.dos_message[15] = 0x0;
874 filehdr_in->pe.nt_signature = NT_SIGNATURE; 874 filehdr_in->pe.nt_signature = NT_SIGNATURE;
875 875
876 H_PUT_16 (abfd, filehdr_in->f_magic, filehdr_out->f_magic); 876 H_PUT_16 (abfd, filehdr_in->f_magic, filehdr_out->f_magic);
877 H_PUT_16 (abfd, filehdr_in->f_nscns, filehdr_out->f_nscns); 877 H_PUT_16 (abfd, filehdr_in->f_nscns, filehdr_out->f_nscns);
878 878
879 /* Only use a real timestamp if the option was chosen. */ 879 /* Only use a real timestamp if the option was chosen. */
880 if ((pe_data (abfd)->insert_timestamp)) 880 if ((pe_data (abfd)->insert_timestamp))
881 H_PUT_32 (abfd, time (0), filehdr_out->f_timdat); 881 H_PUT_32 (abfd, time (0), filehdr_out->f_timdat);
 882 else
 883 H_PUT_32 (abfd, 0, filehdr_out->f_timdat);
882 884
883 PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, 885 PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr,
884 filehdr_out->f_symptr); 886 filehdr_out->f_symptr);
885 H_PUT_32 (abfd, filehdr_in->f_nsyms, filehdr_out->f_nsyms); 887 H_PUT_32 (abfd, filehdr_in->f_nsyms, filehdr_out->f_nsyms);
886 H_PUT_16 (abfd, filehdr_in->f_opthdr, filehdr_out->f_opthdr); 888 H_PUT_16 (abfd, filehdr_in->f_opthdr, filehdr_out->f_opthdr);
887 H_PUT_16 (abfd, filehdr_in->f_flags, filehdr_out->f_flags); 889 H_PUT_16 (abfd, filehdr_in->f_flags, filehdr_out->f_flags);
888 890
889 /* Put in extra dos header stuff. This data remains essentially 891 /* Put in extra dos header stuff. This data remains essentially
890 constant, it just has to be tacked on to the beginning of all exes 892 constant, it just has to be tacked on to the beginning of all exes
891 for NT. */ 893 for NT. */
892 H_PUT_16 (abfd, filehdr_in->pe.e_magic, filehdr_out->e_magic); 894 H_PUT_16 (abfd, filehdr_in->pe.e_magic, filehdr_out->e_magic);
893 H_PUT_16 (abfd, filehdr_in->pe.e_cblp, filehdr_out->e_cblp); 895 H_PUT_16 (abfd, filehdr_in->pe.e_cblp, filehdr_out->e_cblp);
894 H_PUT_16 (abfd, filehdr_in->pe.e_cp, filehdr_out->e_cp); 896 H_PUT_16 (abfd, filehdr_in->pe.e_cp, filehdr_out->e_cp);