From 0128cbae50e269c59d85affb5c104329fd8d2ffd Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@cygnus>
Date: Fri, 4 Nov 1994 00:39:49 +0000
Subject: [PATCH] * Makefile.in (check): Add missing "else true" clause.

* emulparams/vax.sh (OUTPUT_FORMAT): Use "a.out".

* scripttempl/go32coff.sc: Changes from DJ Delorie: Change default entry point
to "start".  Align at end of each section to 0x200.  Start .text section 0x1000
later.  Add _etext, _edata, _end symbols.
---
 ld/ChangeLog               | 11 +++++++++++
 ld/Makefile.in             |  3 ++-
 ld/scripttempl/go32coff.sc | 14 ++++++++------
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index fe7ccfdfb0f..34027920dea 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,14 @@
+Thu Nov  3 19:35:44 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* Makefile.in (check): Add missing "else true" clause.
+
+	* emulparams/vax.sh (OUTPUT_FORMAT): Use "a.out".
+
+	* scripttempl/go32coff.sc: Changes from DJ Delorie: Change default
+	entry point to "start".  Align at end of each section to 0x200.
+	Start .text section 0x1000 later.  Add _etext, _edata, _end
+	symbols.
+
 Wed Nov  2 12:17:49 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
 
 	* ldctor.c (ldctor_add_set_entry): Don't permit a set to be
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 57ac88a0d9d..29d9eacc88c 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -509,7 +509,8 @@ check: site.exp
 	EXPECT=${EXPECT} ; export EXPECT ; \
 	if [ -f $$r/../expect/expect ] ; then  \
 	   TCL_LIBRARY=$${srcroot}/../tcl/library ; \
-	   export TCL_LIBRARY ; fi ; \
+	   export TCL_LIBRARY ; \
+	else true ; fi ; \
 	$(RUNTEST) --tool ld --srcdir $(srcdir)/testsuite $(RUNTESTFLAGS) \
 	  CC="$(CC_FOR_TARGET)" CFLAGS="$(CFLAGS)" \
 	  CXX="$(CXX_FOR_TARGET)" CXXFLAGS="$(CXXFLAGS)"
diff --git a/ld/scripttempl/go32coff.sc b/ld/scripttempl/go32coff.sc
index 8ea702d162b..40f6076345a 100644
--- a/ld/scripttempl/go32coff.sc
+++ b/ld/scripttempl/go32coff.sc
@@ -1,7 +1,7 @@
 # Linker script for 386 go32
 # DJ Delorie (dj@ctron.com)
 
-test -z "$ENTRY" && ENTRY=_start
+test -z "$ENTRY" && ENTRY=start
 cat <<EOF
 OUTPUT_FORMAT("${OUTPUT_FORMAT}")
 ${LIB_SEARCH_DIRS}
@@ -10,22 +10,24 @@ ENTRY(${ENTRY})
 
 SECTIONS
 {
-  .text ${RELOCATING+ SIZEOF_HEADERS} : {
+  .text ${RELOCATING+ 0x1000+SIZEOF_HEADERS} : {
     *(.text)
-    ${RELOCATING+ etext  =  .};
+    ${RELOCATING+ etext  =  . ; _etext = .};
+    ${RELOCATING+ . = ALIGN(0x200);}
   }
   .data ${RELOCATING+ ${DATA_ALIGNMENT}} : {
     ${RELOCATING+ *(.ctor)}
     ${RELOCATING+ *(.dtor)}
     *(.data)
-    ${RELOCATING+ edata  =  .};
-    ${RELOCATING+. = ALIGN(${PAGE_SIZE});}
+    ${RELOCATING+ edata  =  . ; _edata = .};
+    ${RELOCATING+ . = ALIGN(0x200);}
   }
   .bss ${RELOCATING+ SIZEOF(.data) + ADDR(.data)} :
   { 					
     *(.bss)
     *(COMMON)
-    ${RELOCATING+ end = .};
+    ${RELOCATING+ end = . ; _end = .};
+    ${RELOCATING+ . = ALIGN(0x200);}
   }
 }
 EOF
-- 
2.30.2