remove maxq-coff port

10 files changed, 30 insertions, 121 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 2548b753df2..a5460edd0e0 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,13 @@
+2010-06-29  Alan Modra  <amodra@gmail.com>
+
+	* emulparams/maxqcoff.sh: Delete file.
+	* scripttempl/maxqcoff.sc: Delete file.
+	* Makefile.am: Remove references to maxq.
+	* configure.tgt: Likewise.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+	* po/POTFILES.in: Regenerate.
+
 2010-06-27  Alan Modra  <amodra@gmail.com>
 
 	* pe-dll.c (fill_edata): Avoid set but unused warning.
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 8f55742e38b..fe0cd9d771e 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -290,7 +290,6 @@ ALL_EMULATIONS = \
 	em68knbsd.@OBJEXT@ \
 	em68kpsos.@OBJEXT@ \
 	em88kbcs.@OBJEXT@ \
-	emaxqcoff.@OBJEXT@ \
 	emcorepe.@OBJEXT@ \
 	emipsbig.@OBJEXT@ \
 	emipsbsd.@OBJEXT@ \
@@ -1381,9 +1380,6 @@ em68kpsos.c:	$(srcdir)/emulparams/m68kpsos.sh \
 em88kbcs.c: $(srcdir)/emulparams/m88kbcs.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/m88kbcs.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} m88kbcs "$(tdir_m88kbcs)"
-emaxqcoff.c: $(srcdir)/emulparams/maxqcoff.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/maxqcoff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} maxqcoff "$(tdir_maxqcoff)"
 emcorepe.c: $(srcdir)/emulparams/mcorepe.sh \
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} mcorepe "$(tdir_mcorepe)"
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 2c2fb84f9cc..0ae1a2be6a8 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -580,7 +580,6 @@ ALL_EMULATIONS = \
 	em68knbsd.@OBJEXT@ \
 	em68kpsos.@OBJEXT@ \
 	em88kbcs.@OBJEXT@ \
-	emaxqcoff.@OBJEXT@ \
 	emcorepe.@OBJEXT@ \
 	emipsbig.@OBJEXT@ \
 	emipsbsd.@OBJEXT@ \
@@ -2407,9 +2406,6 @@ em68kpsos.c:	$(srcdir)/emulparams/m68kpsos.sh \
 em88kbcs.c: $(srcdir)/emulparams/m88kbcs.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/m88kbcs.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} m88kbcs "$(tdir_m88kbcs)"
-emaxqcoff.c: $(srcdir)/emulparams/maxqcoff.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/maxqcoff.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} maxqcoff "$(tdir_maxqcoff)"
 emcorepe.c: $(srcdir)/emulparams/mcorepe.sh \
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} mcorepe "$(tdir_mcorepe)"
diff --git a/ld/configure b/ld/configure
index ed3da982c21..ebe365744e4 100755
--- a/ld/configure
+++ b/ld/configure
@@ -1884,8 +1884,10 @@ $as_echo "$ac_res" >&6; }
 ac_fn_c_check_decl ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
-$as_echo_n "checking whether $2 is declared... " >&6; }
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
@@ -1895,8 +1897,12 @@ $4
 int
 main ()
 {
-#ifndef $2
-  (void) $2;
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
 #endif
 
   ;
@@ -11614,7 +11620,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11617 "configure"
+#line 11623 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11720,7 +11726,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11723 "configure"
+#line 11729 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/ld/configure.tgt b/ld/configure.tgt
index f75c96aa2ef..9bbb702a0a4 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -355,8 +355,6 @@ m68*-*-rtems*)		targ_emul=m68kelf
 			;;
 m8*-*-*)		targ_emul=m88kbcs
 			;;
-maxq-*-coff)            targ_emul=maxqcoff
-			;;
 mcore-*-pe)		targ_emul=mcorepe ;
 			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
 mcore-*-elf)		targ_emul=elf32mcore
diff --git a/ld/emulparams/maxqcoff.sh b/ld/emulparams/maxqcoff.sh
deleted file mode 100644
index d07533bad6b..00000000000
--- a/ld/emulparams/maxqcoff.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-OUTPUT_FORMAT="coff-maxq"
-
-SCRIPT_NAME=maxqcoff
-
-ARCH=MAXQ
-
-TEXT_START_ADDR=0x8000
diff --git a/ld/po/POTFILES.in b/ld/po/POTFILES.in
index 48172c489b0..f48a991fa7d 100644
--- a/ld/po/POTFILES.in
+++ b/ld/po/POTFILES.in
@@ -14,6 +14,7 @@ ldfile.c
 ldfile.h
 ldlang.c
 ldlang.h
+ldlex-wrapper.c
 ldlex.h
 ldmain.c
 ldmain.h
diff --git a/ld/scripttempl/maxqcoff.sc b/ld/scripttempl/maxqcoff.sc
deleted file mode 100644
index d35107d778f..00000000000
--- a/ld/scripttempl/maxqcoff.sc
+++ /dev/null
@@ -1,43 +0,0 @@
-test -z "$ENTRY" && ENTRY=_main
-cat <<EOF
-OUTPUT_FORMAT("${OUTPUT_FORMAT}")
-${LIB_SEARCH_DIRS}
-${RELOCATING+ENTRY (${ENTRY})}
-MEMORY 
-  {
-  rom (rx)  : ORIGIN = 0, LENGTH = 0x7FFE
-  ram (!rx) : org = 0x0A000, l = 0x5FFF
-  }
-
-SECTIONS
-{
-	.text  ${RELOCATING+ 0x0000}: 
-	{
-		*(.text) 
-	} >rom
-
-	.data ${RELOCATING}: 
-	{ 
-		*(.data)  
-		*(.rodata)
-		*(.bss)
-		*(COMMON)
-		${RELOCATING+ edata  =  .};
-	}>ram
-
-/*	.bss ${RELOCATING+ SIZEOF(.data) + 0x0000}  :
-	{ 
-		*(.bss)  
-		*(COMMON)
-	}
-*/
-	.stab  0 ${RELOCATING+(NOLOAD)} :
-	{
-		[ .stab ]
-	}
-	.stabstr  0 ${RELOCATING+(NOLOAD)} :
-	{
-		[ .stabstr ]
-	}
-}
-EOF
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 03ee49da7a5..5a9fcb9cf68 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-29  Alan Modra  <amodra@gmail.com>
+
+	* ld-maxq/maxq.exp: Delete file.
+	* ld-maxq/addend.dd, * ld-maxq/addend.s, * ld-maxq/paddr.dd,
+	* ld-maxq/paddr.s, * ld-maxq/paddr1.dd, * ld-maxq/paddr1.s,
+	* ld-maxq/r32-1.s, * ld-maxq/r32-2.s, * ld-maxq/r32.dd: Likewise.
+
 2010-06-15  Joseph Myers  <joseph@codesourcery.com>
 
 	* ld-elf/orphan3.d: Allow section names starting '_'.
diff --git a/ld/testsuite/ld-maxq/maxq.exp b/ld/testsuite/ld-maxq/maxq.exp
deleted file mode 100644
index b51bbd83b25..00000000000
--- a/ld/testsuite/ld-maxq/maxq.exp
+++ /dev/null
@@ -1,55 +0,0 @@
-# Expect script for ld-maxq tests
-#   Copyright (C) 2004, 2005, 2007 Free Software Foundation
-#
-# This file is part of the GNU Binutils.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
-# MA 02110-1301, USA.
-#
-# Written by inderpreetb@noida.hcltech.com
-
-# Test maxq linking; all types of relocs.  This tests the assembler and
-# tools like objdump as well as the linker.
-
-if { !([istarget "maxq*-*-*"]  ) } {
-    return
-}
-
-# List contains test-items with 3 items followed by 2 lists:
-# 0:name 1:ld options 2:assembler options
-# 3:filenames of assembler files 4: action and options. 5: name of output file
-
-# Actions:
-# objdump: Apply objdump options on result.  Compare with regex (last arg).
-# nm: Apply nm options on result.  Compare with regex (last arg).
-# readelf: Apply readelf options on result.  Compare with regex (last arg).
-
-set maxqtests {
-{"32-bit Relocation check" "" ""
-{r32-1.s r32-2.s} {{objdump -drw r32.dd}}
-"r32.o" }
-{"maxq addend check" "" ""
-{addend.s} {{objdump -dw addend.dd}}
-"addendo.o" }
-{"16bit relocation test" "" ""
-{paddr.s} {{objdump -Dw paddr.dd}}
-"paddro.o" }
-{"16bit relocation test-1" "" ""
-{paddr1.s} {{objdump -Dw paddr1.dd}}
-"paddro1.o" }
-
-}
-
-run_ld_link_tests $maxqtests