* Makefile.am (TARG_ENV_HFILES): Add config/te-solaris.h.

	* Makefile.in (TARG_ENV_HFILES): Likewise.
	* configure.tgt (Solaris targets): Set em=solaris.
	* config/te-solaris.h: New file.

5 files changed, 44 insertions, 4 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index eb8240d6f8b..0c40e5974c0 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-26  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* Makefile.am (TARG_ENV_HFILES): Add config/te-solaris.h.
+	* Makefile.in (TARG_ENV_HFILES): Likewise.
+	* configure.tgt (Solaris targets): Set em=solaris.
+	* config/te-solaris.h: New file.
+
 2008-09-26  Jie Zhang  <jie.zhang@analog.com>
 
 	* config/bfin-parse.y (asm_1): Fix reduce/reduce conflicts.
diff --git a/gas/Makefile.am b/gas/Makefile.am
index a8b61cfa8bc..86fd7c5de0d 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -406,6 +406,7 @@ TARG_ENV_HFILES = \
 	config/te-pe.h \
 	config/te-psos.h \
 	config/te-riscix.h \
+	config/te-solaris.h \
 	config/te-sparcaout.h \
 	config/te-sun3.h \
 	config/te-svr4.h \
diff --git a/gas/Makefile.in b/gas/Makefile.in
index 6b68a98e167..fa4ae16f9b4 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -653,6 +653,7 @@ TARG_ENV_HFILES = \
 	config/te-pe.h \
 	config/te-psos.h \
 	config/te-riscix.h \
+	config/te-solaris.h \
 	config/te-sparcaout.h \
 	config/te-sun3.h \
 	config/te-svr4.h \
diff --git a/gas/config/te-solaris.h b/gas/config/te-solaris.h
new file mode 100644
index 00000000000..a3c2ceaf9e8
--- /dev/null
+++ b/gas/config/te-solaris.h
@@ -0,0 +1,30 @@
+/* Copyright 2008 Free Software Foundation, Inc.
+
+   This file is part of GAS, the GNU Assembler.
+
+   GAS 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,
+   or (at your option) any later version.
+
+   GAS 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 GAS; see the file COPYING.  If not, write to the Free
+   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+#define TE_SOLARIS
+
+#define LOCAL_LABELS_DOLLAR 1
+#define LOCAL_LABELS_FB 1
+
+/* The Sun linker doesn't merge read-only and read-write sections into
+   a single read-write section so we must force all EH frame sections
+   to be read-write.  */
+#define DWARF2_EH_FRAME_READ_ONLY 0
+
+#include "obj-format.h"
diff --git a/gas/configure.tgt b/gas/configure.tgt
index fd355c905e5..76b10bee2d2 100644
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -198,7 +198,7 @@ case ${generic_target} in
   i386-*-linux-*)			fmt=elf em=linux ;;
   i386-*-lynxos*)			fmt=elf em=lynx ;;
   i386-*-sysv[45]*)			fmt=elf ;;
-  i386-*-solaris*)			fmt=elf ;;
+  i386-*-solaris*)			fmt=elf em=solaris ;;
   i386-*-freebsdaout*)			fmt=aout em=386bsd ;;
   i386-*-freebsd[12].*)			fmt=aout em=386bsd ;;
   i386-*-freebsd[12])			fmt=aout em=386bsd ;;
@@ -322,7 +322,7 @@ case ${generic_target} in
   ppc-*-*n*bsd* | ppc-*-elf*)		fmt=elf ;;
   ppc-*-eabi* | ppc-*-sysv4*)		fmt=elf ;;
   ppc-*-linux-*)			fmt=elf em=linux ;;
-  ppc-*-solaris*)			fmt=elf ;;
+  ppc-*-solaris*)			fmt=elf em=solaris ;;
   ppc-*-rtems*)				fmt=elf ;;
   ppc-*-macos*)				fmt=coff em=macos ;;
   ppc-*-nto*)				fmt=elf ;;
@@ -362,7 +362,7 @@ case ${generic_target} in
   sparc-fujitsu-none)			fmt=aout ;;
   sparc-*-elf)				fmt=elf ;;
   sparc-*-sysv4*)			fmt=elf ;;
-  sparc-*-solaris*)			fmt=elf ;;
+  sparc-*-solaris*)			fmt=elf em=solaris ;;
   sparc-*-netbsdelf*)			fmt=elf em=nbsd ;;
   sparc-*-netbsd*)
     case ${cpu} in
@@ -408,7 +408,8 @@ case ${generic_target} in
   *-*-generic)				fmt=generic ;;
   *-*-xray | *-*-hms)			fmt=coff ;;
   *-*-sim)				fmt=coff ;;
-  *-*-elf | *-*-sysv4* | *-*-solaris*)	fmt=elf ;;
+  *-*-elf | *-*-sysv4*)			fmt=elf ;;
+  *-*-solaris*)				fmt=elf em=solaris ;;
   *-*-aros*)				fmt=elf em=linux ;;
   *-*-vxworks* | *-*-windiss)		fmt=elf em=vxworks ;;
   *-*-netware)				fmt=elf em=netware ;;