Switch from using 'nacl_main' to 'main' entry point

ports/binutils/nacl.patch

Index: ports/binutils/nacl.patch
diff --git a/ports/binutils/nacl.patch b/ports/binutils/nacl.patch
index 1e231e5791f372f863579dec2074ec0f419878e4..cda742c6560edad375aec5c5676efbabde4efd99 100644
--- a/ports/binutils/nacl.patch
+++ b/ports/binutils/nacl.patch
@@ -31,16 +31,6 @@ diff --git a/binutils/Makefile.in b/binutils/Makefile.in
  LIBTOOL = @LIBTOOL@
  LIPO = @LIPO@
  LN_S = @LN_S@
-@@ -484,7 +484,8 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \
- 	 @HDEFINES@ \
- 	 @INCINTL@ \
- 	 -DLOCALEDIR="\"$(datadir)/locale\"" \
--	 -Dbin_dummy_emulation=$(EMULATION_VECTOR)
-+	 -Dbin_dummy_emulation=$(EMULATION_VECTOR) \
-+	 -Dmain=nacl_main
- 
- HFILES = \
- 	arsup.h binemul.h bucomm.h budbg.h \
 diff --git a/gas/Makefile.in b/gas/Makefile.in
 --- a/gas/Makefile.in
 +++ b/gas/Makefile.in
@@ -53,30 +43,10 @@ diff --git a/gas/Makefile.in b/gas/Makefile.in
  LIBTOOL = @LIBTOOL@
  LIPO = @LIPO@
  LN_S = @LN_S@
-@@ -640,7 +640,8 @@ INCDIR = $(BASEDIR)/include
- # subdirectory rather than in the source directory.
- AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(srcdir)/config \
- 	-I$(INCDIR) -I$(srcdir)/.. -I$(BFDDIR) @INCINTL@ \
--	-DLOCALEDIR="\"$(datadir)/locale\""
-+	-DLOCALEDIR="\"$(datadir)/locale\"" \
-+	-Dmain=nacl_main
- 
- 
- # How to link with both our special library facilities
 diff --git a/ld/Makefile.in b/ld/Makefile.in
 --- a/ld/Makefile.in
 +++ b/ld/Makefile.in
-@@ -448,7 +448,8 @@ TEXI2DVI = texi2dvi -I $(srcdir) -I $(BFDDIR)/doc -I ../bfd/doc \
- 
- AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \
- 	@INCINTL@ $(HDEFINES) $(CFLAGS) $(PLUGIN_CFLAGS) \
--	-DLOCALEDIR="\"$(datadir)/locale\""
-+	-DLOCALEDIR="\"$(datadir)/locale\"" \
-+	-Dmain=nacl_main
- 
- BFDLIB = ../bfd/libbfd.la
- LIBIBERTY = ../libiberty/libiberty.a
-@@ -890,7 +891,7 @@ ld_new_SOURCES = ldgram.y ldlex-wrapper.c lexsup.c ldlang.c mri.c ldctor.c ldmai
+@@ -890,7 +890,7 @@ ld_new_SOURCES = ldgram.y ldlex-wrapper.c lexsup.c ldlang.c mri.c ldctor.c ldmai
  	ldwrite.c ldexp.c ldemul.c ldver.c ldmisc.c ldfile.c ldcref.c $(PLUGIN_C)
  
  ld_new_DEPENDENCIES = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBIBERTY) $(LIBINTL_DEP)
@@ -85,7 +55,7 @@ diff --git a/ld/Makefile.in b/ld/Makefile.in
  
  # A test program for C++ constructors and destructors.
  # This test is now in the testsuite.
-@@ -1072,7 +1073,10 @@ deffilep.h: deffilep.c
+@@ -1072,7 +1072,10 @@ deffilep.h: deffilep.c
  	else :; fi
  ld-new$(EXEEXT): $(ld_new_OBJECTS) $(ld_new_DEPENDENCIES) 
  	@rm -f ld-new$(EXEEXT)