From e90052b750babee22014324091f43989f4785621 Mon Sep 17 00:00:00 2001 From: midipix Date: Sat, 28 Mar 2015 15:51:58 -0400 Subject: ld: set the default executable name to 'a.out' properly. signed-off by Z. Gilboa; see copying.midipix (9cd0746c) for additional information. --- binutils-2.24.51.midipix.patch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'binutils-2.24.51.midipix.patch') diff --git a/binutils-2.24.51.midipix.patch b/binutils-2.24.51.midipix.patch index 3cdd8d9..493bed7 100644 --- a/binutils-2.24.51.midipix.patch +++ b/binutils-2.24.51.midipix.patch @@ -14,10 +14,11 @@ diff -ru --new-file a/bfd/midipix.h b/bfd/midipix.h +#endif --- a/ld/configure 2014-07-03 01:37:48.000000000 -0400 +++ b/ld/configure 2015-03-11 20:01:08.888756786 -0400 -@@ -19773,3 +19773,22 @@ +@@ -19773,3 +19773,23 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi ++sed -i -e 's/@pe_executable_name@/'$PE_EXECUTABLE_NAME'/g' Makefile +sed -i -e 's/@pe_crt_section@/'$PE_CRT_SECTION'/g' Makefile +sed -i -e 's/@pe_cygwin_fork_support@/'$PE_CYGWIN_FORK_SUPPORT'/g' Makefile + @@ -208,7 +209,7 @@ diff -ru --new-file a/ld/configure.tgt b/ld/configure.tgt targ_extra_ofiles="deffilep.o pe-dll.o" ;; +i[3-7]86-*-midipix*) targ_emul=i386pe ; + targ_extra_ofiles="deffilep.o pe-dll.o" ; -+ EXECUTABLE_NAME=a.out ; ++ PE_EXECUTABLE_NAME=a.out ; + PE_CRT_SECTION=no ; + PE_CYGWIN_FORK_SUPPORT=no ;; x86_64-*-pe | x86_64-*-pep) targ_emul=i386pep ; @@ -222,7 +223,7 @@ diff -ru --new-file a/ld/configure.tgt b/ld/configure.tgt +x86_64-*-midipix*) targ_emul=i386pep ; + targ_extra_emuls=i386pe ; + targ_extra_ofiles="deffilep.o pep-dll.o pe-dll.o" ; -+ EXECUTABLE_NAME=a.out ; ++ PE_EXECUTABLE_NAME=a.out ; + PE_CRT_SECTION=no ; + PE_CYGWIN_FORK_SUPPORT=no ;; +i[3-7]86-*-interix*) targ_emul=i386pe_posix ; @@ -232,10 +233,11 @@ diff -ru --new-file a/ld/configure.tgt b/ld/configure.tgt diff -ru --new-file a/ld/Makefile.in b/ld/Makefile.in --- a/ld/Makefile.in 2014-07-03 01:37:48.000000000 -0400 +++ b/ld/Makefile.in 2015-03-11 20:09:38.972773108 -0400 -@@ -54,6 +54,8 @@ +@@ -54,6 +54,9 @@ host_triplet = @host@ target_triplet = @target@ bin_PROGRAMS = ld-new$(EXEEXT) ++PE_EXECUTABLE_NAME = @pe_executable_name@ +PE_CRT_SECTION = @pe_crt_section@ +PE_CYGWIN_FORK_SUPPORT = @pe_cygwin_fork_support@ @@ -246,7 +248,7 @@ diff -ru --new-file a/ld/Makefile.in b/ld/Makefile.in # These all start with e so 'make clean' can find them. -GENSCRIPTS = LIB_PATH='${LIB_PATH}' $(SHELL) $(srcdir)/genscripts.sh "${srcdir}" "${libdir}" "${prefix}" "${exec_prefix}" @host@ @target@ @target_alias@ "@EMULATION_LIBPATH@" "@NATIVE_LIB_DIRS@" @use_sysroot@ @enable_initfini_array@ -+GENSCRIPTS = PE_CRT_SECTION='${PE_CRT_SECTION}' PE_CYGWIN_FORK_SUPPORT='${PE_CYGWIN_FORK_SUPPORT}' LIB_PATH='${LIB_PATH}' $(SHELL) $(srcdir)/genscripts.sh "${srcdir}" "${libdir}" "${prefix}" "${exec_prefix}" @host@ @target@ @target_alias@ "@EMULATION_LIBPATH@" "@NATIVE_LIB_DIRS@" @use_sysroot@ @enable_initfini_array@ ++GENSCRIPTS = EXECUTABLE_NAME='${PE_EXECUTABLE_NAME}' PE_CRT_SECTION='${PE_CRT_SECTION}' PE_CYGWIN_FORK_SUPPORT='${PE_CYGWIN_FORK_SUPPORT}' LIB_PATH='${LIB_PATH}' $(SHELL) $(srcdir)/genscripts.sh "${srcdir}" "${libdir}" "${prefix}" "${exec_prefix}" @host@ @target@ @target_alias@ "@EMULATION_LIBPATH@" "@NATIVE_LIB_DIRS@" @use_sysroot@ @enable_initfini_array@ GEN_DEPENDS = $(srcdir)/genscripts.sh stringify.sed ELF_DEPS = $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/elf-generic.em $(srcdir)/scripttempl/DWARF.sc ELF_GEN_DEPS = $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/elf-generic.em $(srcdir)/emultempl/genelf.em $(srcdir)/scripttempl/DWARF.sc -- cgit v1.2.3