* emulparams/xtensa-config.sh: Delete file.

        * emulparams/elf32xtensa.sh: Set MAXPAGESIZE here instead of including
        xtensa-config.sh.
        * Makefile.am (eelf32xtensa.c): Remove dependency on xtensa-config.sh.
        * Makefile.in: Regenerate.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 0af25ae490b367b92658329a1c404f47fddf1f25..09fd5505f583e6741e0516935734339b196fc7d1 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-04  Bob Wilson  <bob.wilson@acm.org>
+
+       * emulparams/xtensa-config.sh: Delete file.
+       * emulparams/elf32xtensa.sh: Set MAXPAGESIZE here instead of including
+       xtensa-config.sh.
+       * Makefile.am (eelf32xtensa.c): Remove dependency on xtensa-config.sh.
+       * Makefile.in: Regenerate.
+
 2006-10-03  Pedro Alves  <pedro_alves@portugalmail.pt>
 
        * pe-dll.c : Fix typo.

diff --git a/ld/Makefile.am b/ld/Makefile.am
index 26f0580a7bb5f1538faa38683de71efce84355f9..ee96f29eb8745eec040525a8ddd94b7db46a528d 100644 (file)
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -671,8 +671,7 @@ eelf32am33lin.c: $(srcdir)/emulparams/elf32am33lin.sh \
 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}

diff --git a/ld/Makefile.in b/ld/Makefile.in
index b754d0b89ea86c41aad1f0b81a460c1a88341d35..49337c2e2c717bcf698907335930b4b24a51ebc3 100644 (file)
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -1482,8 +1482,7 @@ eelf32am33lin.c: $(srcdir)/emulparams/elf32am33lin.sh \
 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}

diff --git a/ld/emulparams/elf32xtensa.sh b/ld/emulparams/elf32xtensa.sh
index 1abef5d86b89afb520bc9648a742fdc2b8573668..01eed3acfbca18ca508b38ee5580971f3821a0d1 100644 (file)
--- a/ld/emulparams/elf32xtensa.sh
+++ b/ld/emulparams/elf32xtensa.sh
@@ -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 @@ BIG_OUTPUT_FORMAT="elf32-xtensa-be"
 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

diff --git a/ld/emulparams/xtensa-config.sh b/ld/emulparams/xtensa-config.sh
deleted file mode 100644 (file)
index 82e96a4..0000000
--- a/ld/emulparams/xtensa-config.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Xtensa configuration settings.
-
-MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"