checkpoint before a merge

1 files changed, 11 insertions, 122 deletions

diff --git a/ld/ld-gld.c b/ld/ld-gld.c
index 00d4493..7607462 100755
--- a/ld/ld-gld.c
+++ b/ld/ld-gld.c
@@ -19,39 +19,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
  *  $Id$ 
  *
- *  $Log$
- *  Revision 1.2  1991/03/22 23:02:29  steve
- *  Brought up to sync with Intel again.
- *
- * Revision 1.2  1991/03/15  18:45:55  rich
- * foo
- *
- * Revision 1.1  1991/03/13  00:48:11  chrisb
- * Initial revision
- *
- * Revision 1.7  1991/03/10  09:31:18  rich
- *  Modified Files:
- *  	Makefile config.h ld-emul.c ld-emul.h ld-gld.c ld-gld960.c
- *  	ld-lnk960.c ld.h lddigest.c ldexp.c ldexp.h ldfile.c ldfile.h
- *  	ldgram.y ldinfo.h ldlang.c ldlang.h ldlex.h ldlex.l ldmain.c
- *  	ldmain.h ldmisc.c ldmisc.h ldsym.c ldsym.h ldversion.c
- *  	ldversion.h ldwarn.h ldwrite.c ldwrite.h y.tab.h
- *
- * As of this round of changes, ld now builds on all hosts of (Intel960)
- * interest and copy passes my copy test on big endian hosts again.
- *
- * Revision 1.6  1991/03/09  03:23:12  sac
- * Added -Ur loader script.
- *
- * Revision 1.5  1991/03/06  21:59:29  sac
- * Completed G++ support
- *
- * Revision 1.4  1991/03/06  02:23:34  sac
- * Added support for partial linking.
- *
- * Revision 1.3  1991/02/22  17:14:56  sac
- * Added RCS keywords and copyrights
- *
 */
 
 /* 
@@ -140,95 +107,17 @@ char  *ignore;
   info("%S HLL ignored\n");
 }
 
-static char *gld_script = "  \
-SEARCH_DIR(/lib) 			\
-SEARCH_DIR(/usr/lib) 			\
-SEARCH_DIR(/usr/local/lib) 		\
-__DYNAMIC = 0; 				\
-SECTIONS 				\
-{ 					\
-  .text 0x2020 BLOCK(0x2000): 		\
-  { 					\
-   CREATE_OBJECT_SYMBOLS 		\
-    *(.text) 				\
-    _etext = ALIGN( 0x2000);       	\
-    }  					\
-  .data  ALIGN(0x2000)  :		\
-  { 					\
-    *(.data) 				\
-    ___DTOR_LIST__=. ;               	\
-    LONG((___CTOR_LIST__ - .)/4 -2)  	\
-    *(___DTOR_LIST__)                   \
-    LONG(0)                             \
-    ___CTOR_LIST__=. ;               	\
-    LONG((_edata  - .)/4 -2)            \
-    *(___CTOR_LIST__)                   \
-    LONG(0)                             \
-      _edata = .; 			\
-  }  					\
-  .bss   SIZEOF(.data) + ADDR(.data) :	\
-  { 					\
-   *(.bss)	 			\
-   [COMMON] 				\
-     _end=.;				\
-    } 					\
-}";
-
-
-static char *gld_script_option_Ur = "\
-SEARCH_DIR(/lib) 			\
-SEARCH_DIR(/usr/lib) 			\
-SEARCH_DIR(/usr/local/lib) 		\
-SECTIONS 				\
-{ 					\
-  .text 0: 				\
-  { 					\
-   CREATE_OBJECT_SYMBOLS                \
-    *(.text) 				\
-    } 					\
-  .data SIZEOF(.text) + ADDR(.text) :	\
-  { 					\
-    *(.data) 				\
-    ___DTOR_LIST__=. ;               	\
-    LONG((___CTOR_LIST__ - .)/4 -2)  	\
-    *(___DTOR_LIST__)                   \
-    LONG(0)                             \
-    ___CTOR_LIST__=. ;               	\
-    LONG((___end_list__  - .)/4 -2)     \
-    *(___CTOR_LIST__)                   \
-    LONG(0)                             \
-    ___end_list__ = . ;			\
-    } 					\
-  .bss SIZEOF(.data) + ADDR(.data) :	\
-  {					\
-    *(.bss)				\
-   [COMMON]				\
-    } 					\
-} 					\
-";			     
-
-static char *gld_script_option_r = "\
-SEARCH_DIR(/lib) 			\
-SEARCH_DIR(/usr/lib) 			\
-SEARCH_DIR(/usr/local/lib) 		\
-SECTIONS 				\
-{ 					\
-  .text 0: 				\
-  { 					\
-   CREATE_OBJECT_SYMBOLS                \
-    *(.text) 				\
-    } 					\
-  .data SIZEOF(.text) + ADDR(.text) :	\
-  { 					\
-    *(.data) 				\
-    } 					\
-  .bss SIZEOF(.data) + ADDR(.data) :	\
-  {					\
-    *(.bss)				\
-   [COMMON]				\
-    } 					\
-} 					\
-";			     
+static char *gld_script = 
+#include "ld-gld.x"
+;
+
+static char *gld_script_option_Ur  =  
+#include "ld-gld-Ur.x"
+;
+
+static char *gld_script_option_r  =  
+#include "ld-gld-r.x"
+;	     
 			     
 static char *gld_get_script()
 {