gcc:

	* config/alpha/t-osf5: Remove.
	* config/alpha/t-osf-pthread: Remove.
	* config.gcc (alpha*-dec-osf5.1*): Set tmake_file to t-slibgcc-dummy.
	* mkmap-flat.awk: Handle osf_export for Tru64 UNIX linker -input file.

	libgcc:
	* configure.ac (target_thread_file): Determine thread model.
	* configure: Regenerate.
	* config.host (alpha*-dec-osf5.1*): Set tmake_file, extra_parts.
	* config/alpha/t-alpha: New file.
	* config/alpha/t-crtfm: Use $<.
	* config/alpha/t-ieee: New file.
	* config/alpha/t-osf-pthread: New file.
	* config/alpha/t-slibgcc-osf: New file.
	* config/alpha/libgcc-osf5.ver: New file.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@174603 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 17 insertions, 58 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b63f0e0543f..08faeb5d478 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-03  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* config/alpha/t-osf5: Remove.
+	* config/alpha/t-osf-pthread: Remove.
+	* config.gcc (alpha*-dec-osf5.1*): Set tmake_file to t-slibgcc-dummy.
+	* mkmap-flat.awk: Handle osf_export for Tru64 UNIX linker -input file.
+
 2011-06-03  Julian Brown  <julian@codesourcery.com>
 
 	* config/arm/arm-cores.def (strongarm, strongarm110, strongarm1100)
diff --git a/gcc/config.gcc b/gcc/config.gcc
index c4915baabbe..b5d16444604 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -756,7 +756,7 @@ alpha*-dec-osf5.1*)
 		extra_passes="mips-tfile mips-tdump"
 	fi
 	use_collect2=yes
-	tmake_file="alpha/t-alpha alpha/t-ieee alpha/t-crtfm alpha/t-osf5"
+	tmake_file="t-slibgcc-dummy"
 	tm_file="${tm_file} alpha/osf5.h"
 	tm_defines="${tm_defines} TARGET_SUPPORT_ARCH=1"
 	extra_options="${extra_options} rpath.opt alpha/osf5.opt"
@@ -765,7 +765,6 @@ alpha*-dec-osf5.1*)
 	case ${enable_threads} in
 	  "" | yes | posix)
 	    thread_file='posix'
-	    tmake_file="${tmake_file} alpha/t-osf-pthread"
 	    ;;
 	esac
 	;;
diff --git a/gcc/config/alpha/t-osf-pthread b/gcc/config/alpha/t-osf-pthread
deleted file mode 100644
index 968e65cce9e..00000000000
--- a/gcc/config/alpha/t-osf-pthread
+++ /dev/null
@@ -1,5 +0,0 @@
-# Provide dummy POSIX threads functions
-LIB2FUNCS_EXTRA += $(srcdir)/gthr-posix.c
-
-# Compile libgcc2 with POSIX threads supports
-TARGET_LIBGCC2_CFLAGS=-pthread
diff --git a/gcc/config/alpha/t-osf5 b/gcc/config/alpha/t-osf5
deleted file mode 100644
index eabf2728f26..00000000000
--- a/gcc/config/alpha/t-osf5
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (C) 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
-#
-# This file is part of GCC.
-#
-# GCC 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.
-#
-# GCC 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 GCC; see the file COPYING3.  If not see
-# <http://www.gnu.org/licenses/>.
-
-# Compile crtbeginS.o and crtendS.o with pic.
-CRTSTUFF_T_CFLAGS_S = -fPIC
-
-# Compile libgcc2.a with pic.
-TARGET_LIBGCC2_CFLAGS = -fPIC
-
-# Build a shared libgcc library.
-SHLIB_EXT = .so
-SHLIB_NAME = @shlib_base_name@.so
-SHLIB_SONAME = @shlib_base_name@.so.1
-SHLIB_OBJS = @shlib_objs@
-
-# Beware *not* to hide the POSIX threads related symbols provided by
-# gthr-posix.c, as this would prevent their preemption by real symbols.
-SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
-	-Wl,-msym -Wl,-set_version,gcc.1 -Wl,-soname,$(SHLIB_SONAME) \
-	-o $(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) -lc && \
-	rm -f $(SHLIB_SONAME) && \
-	if [ -f $(SHLIB_NAME) ]; then \
-	  mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \
-	else true; fi && \
-	mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \
-	$(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME)
-# $(slibdir) double quoted to protect it from expansion while building
-# libgcc.mk.  We want this delayed until actual install time.
-SHLIB_INSTALL = \
-	$$(mkinstalldirs) $$(DESTDIR)$$(slibdir); \
-	$(INSTALL_DATA) $(SHLIB_NAME) $$(DESTDIR)$$(slibdir)/$(SHLIB_SONAME); \
-	rm -f $$(DESTDIR)$$(slibdir)/$(SHLIB_NAME); \
-	$(LN_S) $(SHLIB_SONAME) $$(DESTDIR)$$(slibdir)/$(SHLIB_NAME)
diff --git a/gcc/mkmap-flat.awk b/gcc/mkmap-flat.awk
index 4afa69f4653..ec5e1fdf513 100644
--- a/gcc/mkmap-flat.awk
+++ b/gcc/mkmap-flat.awk
@@ -1,5 +1,5 @@
 # Generate a flat list of symbols to export.
-#	Copyright (C) 2007, 2008, 2009  Free Software Foundation, Inc.
+#	Copyright (C) 2007, 2008, 2009, 2011  Free Software Foundation, Inc.
 #	Contributed by Richard Henderson <rth@cygnus.com>
 #
 # This file is part of GCC.
@@ -20,6 +20,8 @@
 
 # Options:
 #   "-v leading_underscore=1" : Symbols in map need leading underscore.
+#   "-v osf_export=1"	      : Create -input file for Tru64 UNIX linker
+#				instead of map file.
 #   "-v pe_dll=1"             : Create .DEF file for Windows PECOFF
 #                               DLL link instead of map file.
 
@@ -98,6 +100,10 @@ END {
   }
 
   for (sym in export)
-    if (def[sym] || (pe_dll && def["_" sym]))
-      print sym;
+    if (def[sym] || (pe_dll && def["_" sym])) {
+      if (!osf_export)
+	print sym;
+      else
+	print "-exported_symbol " sym;
+    }
 }