Index: emulparams/elf32xtensa.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/elf32xtensa.sh,v
retrieving revision 1.6
diff -u -r1.6 elf32xtensa.sh
--- emulparams/elf32xtensa.sh	25 Aug 2006 00:08:55 -0000	1.6
+++ emulparams/elf32xtensa.sh	4 Oct 2006 23:26:50 -0000
@@ -1,7 +1,3 @@
-# First set some configuration-specific variables
-. ${srcdir}/emulparams/xtensa-config.sh
-
-# See genscripts.sh and ../scripttempl/elfxtensa.sc for the meaning of these.
 SCRIPT_NAME=elfxtensa
 TEMPLATE_NAME=elf32
 EXTRA_EM_FILE=xtensaelf
@@ -10,6 +6,7 @@
 LITTLE_OUTPUT_FORMAT="elf32-xtensa-le"
 TEXT_START_ADDR=0x400000
 NONPAGED_TEXT_START_ADDR=0x400000
+MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 ARCH=xtensa
 MACHINE=
 GENERATE_SHLIB_SCRIPT=yes
Index: Makefile.am
===================================================================
RCS file: /cvs/src/src/ld/Makefile.am,v
retrieving revision 1.221
diff -u -r1.221 Makefile.am
--- Makefile.am	20 Sep 2006 11:35:08 -0000	1.221
+++ Makefile.am	4 Oct 2006 23:55:21 -0000
@@ -671,8 +671,7 @@
 eelf32vax.c: $(srcdir)/emulparams/elf32vax.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32vax "$(tdir_elf32vax)"
-eelf32xtensa.c: $(srcdir)/emulparams/elf32xtensa.sh \
-  $(srcdir)/emulparams/xtensa-config.sh $(ELF_DEPS) \
+eelf32xtensa.c: $(srcdir)/emulparams/elf32xtensa.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/xtensaelf.em $(INCDIR)/xtensa-config.h \
   $(BFDDIR)/elf-bfd.h $(BFDDIR)/libbfd.h $(INCDIR)/elf/xtensa.h \
   $(srcdir)/scripttempl/elfxtensa.sc ${GEN_DEPENDS}