From 52943ff383ddc70fec1e1e4193adbea0259e34ab Mon Sep 17 00:00:00 2001 From: "ro@138bc75d-0d04-0410-961f-82ee72b054a4" Date: Mon, 12 Apr 2010 18:36:30 +0000 Subject: [PATCH] gcc: * config.build (alpha*-dec-osf4*): Remove. * config.gcc: Remove alpha*-dec-osf4*, alpha-dec-osf5.0* from list of obsolete configurations. (alpha*-dec-osf[45]*): Remove alpha*-dec-osf4*, alpha-dec-osf5.0* support. * config/alpha/t-osf4: Renamed to ... * config/alpha/t-osf5: ... this. * config/alpha/osf.h: Renamed to ... * config/alpha/osf5.h: ... this. Merged old osf5.h contents. Update comments. (ASM_SPEC): Use ASM_OLDAS_SPEC directly. (EXTRA_SPECS): Removed. * doc/install.texi (Specific, alpha*-dec-osf5.1): Renamed to reflect removal of Tru64 UNIX V4.0/V5.0 support. Document that. fixincludes: * inclhack.def (alpha_wchar): Remove. * fixincl.x: Regenerate. * tests/base/wchar.h: Remove. libgcc: * config.host (alpha*-dec-osf[45]*): Removed alpha*-dec-osf4*, alpha-dec-osf5.0* support. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158235 138bc75d-0d04-0410-961f-82ee72b054a4 --- fixincludes/ChangeLog | 6 ++++++ fixincludes/fixincl.x | 53 +++++------------------------------------------- fixincludes/inclhack.def | 21 ------------------- gcc/ChangeLog | 19 +++++++++++++++++ gcc/config.gcc | 24 +++++----------------- gcc/config/alpha/osf5.h | 8 -------- gcc/config/arm/t-netbsd | 47 ------------------------------------------ gcc/doc/install.texi | 9 ++++---- libgcc/ChangeLog | 5 +++++ libgcc/config.host | 2 +- 10 files changed, 45 insertions(+), 149 deletions(-) delete mode 100644 gcc/config/arm/t-netbsd diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index ee1087058d4..b0b26dfe3fd 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,9 @@ +2010-04-12 Rainer Orth + + * inclhack.def (alpha_wchar): Remove. + * fixincl.x: Regenerate. + * tests/base/wchar.h: Remove. + 2010-04-02 Ralf Wildenhues * aclocal.m4: Regenerate. diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index d66766cea2e..e80d50c5adc 100644 --- a/fixincludes/fixincl.x +++ b/fixincludes/fixincl.x @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed Tuesday March 30, 2010 at 09:51:20 PM MEST + * It has been AutoGen-ed Wednesday April 7, 2010 at 05:11:50 PM MEST * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Mar 30 21:51:20 MEST 2010 +/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Apr 7 17:11:50 MEST 2010 * * You must regenerate it. Use the ./genfixes script. * @@ -15,7 +15,7 @@ * certain ANSI-incompatible system header files which are fixed to work * correctly with ANSI C and placed in a directory that GNU C will search. * - * This file contains 206 fixup descriptions. + * This file contains 205 fixup descriptions. * * See README for more information. * @@ -1354,43 +1354,6 @@ static const char* apzAlpha_SbrkPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Alpha_Wchar fix - */ -tSCC zAlpha_WcharName[] = - "alpha_wchar"; - -/* - * File name selection pattern - */ -tSCC zAlpha_WcharList[] = - "wchar.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzAlpha_WcharMachs[] = { - "alpha*-dec-osf4*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zAlpha_WcharSelect0[] = - "#define wcstok wcstok_r"; - -#define ALPHA_WCHAR_TEST_CT 1 -static tTestDesc aAlpha_WcharTests[] = { - { TT_EGREP, zAlpha_WcharSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Alpha_Wchar - */ -static const char* apzAlpha_WcharPatch[] = { sed_cmd_z, - "-e", "s@#define wcstok wcstok_r@extern wchar_t *wcstok __((wchar_t *, const wchar_t *, wchar_t **)) __asm__(\"wcstok_r\");@", - "-e", "s@#define wcsftime __wcsftime_isoc@extern size_t wcsftime __((wchar_t *, size_t, const wchar_t *, const struct tm *)) __asm__(\"__wcsftime_isoc\");@", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Avoid_Bool_Define fix */ tSCC zAvoid_Bool_DefineName[] = @@ -8395,9 +8358,9 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 246 +#define REGEX_COUNT 245 #define MACH_LIST_SIZE_LIMIT 181 -#define FIX_COUNT 206 +#define FIX_COUNT 205 /* * Enumerate the fixes @@ -8434,7 +8397,6 @@ typedef enum { ALPHA_PTHREAD_GCC_FIXIDX, ALPHA_PTHREAD_INIT_FIXIDX, ALPHA_SBRK_FIXIDX, - ALPHA_WCHAR_FIXIDX, AVOID_BOOL_DEFINE_FIXIDX, AVOID_BOOL_TYPE_FIXIDX, AVOID_WCHAR_T_TYPE_FIXIDX, @@ -8767,11 +8729,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { ALPHA_SBRK_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAlpha_SbrkTests, apzAlpha_SbrkPatch, 0 }, - { zAlpha_WcharName, zAlpha_WcharList, - apzAlpha_WcharMachs, - ALPHA_WCHAR_TEST_CT, FD_MACH_ONLY, - aAlpha_WcharTests, apzAlpha_WcharPatch, 0 }, - { zAvoid_Bool_DefineName, zAvoid_Bool_DefineList, apzAvoid_Bool_DefineMachs, AVOID_BOOL_DEFINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index 910b3889270..4f70a9f3a64 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -794,27 +794,6 @@ fix = { /* - * Change external names of wcstok/wcsftime via asm instead of macros on - * Tru64 UNIX V4.0. - */ -fix = { - hackname = alpha_wchar; - files = wchar.h; - - mach = "alpha*-dec-osf4*"; - select = "#define wcstok wcstok_r"; - sed = "s@#define wcstok wcstok_r@" - "extern wchar_t *wcstok __((wchar_t *, const wchar_t *, " - "wchar_t **)) __asm__(\"wcstok_r\");@"; - sed = "s@#define wcsftime __wcsftime_isoc@" - "extern size_t wcsftime __((wchar_t *, size_t, const wchar_t *" - ", const struct tm *)) __asm__(\"__wcsftime_isoc\");@"; - test_text = "#define wcstok wcstok_r\n" - "#define wcsftime __wcsftime_isoc"; -}; - - -/* * For C++, avoid any typedef or macro definition of bool, * and use the built in type instead. * HP/UX 10.20 also has it in curses_colr/curses.h. diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fa98b2eaa22..cfdaa9e8b92 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,24 @@ 2010-04-12 Rainer Orth + * config.build (alpha*-dec-osf4*): Remove. + * config.gcc: Remove alpha*-dec-osf4*, alpha-dec-osf5.0* from list + of obsolete configurations. + (alpha*-dec-osf[45]*): Remove alpha*-dec-osf4*, alpha-dec-osf5.0* + support. + * config/alpha/t-osf4: Renamed to ... + * config/alpha/t-osf5: ... this. + * config/alpha/osf.h: Renamed to ... + * config/alpha/osf5.h: ... this. + Merged old osf5.h contents. + Update comments. + (ASM_SPEC): Use ASM_OLDAS_SPEC directly. + (EXTRA_SPECS): Removed. + * doc/install.texi (Specific, alpha*-dec-osf5.1): Renamed to + reflect removal of Tru64 UNIX V4.0/V5.0 support. + Document that. + +2010-04-12 Rainer Orth + * doc/contrib.texi (Contributors, Rainer Orth): Update. 2010-04-12 Kai Tietz diff --git a/gcc/config.gcc b/gcc/config.gcc index 119bf0ac645..a5788653dfc 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -207,9 +207,7 @@ md_file= # Obsolete configurations. case ${target} in - alpha*-dec-osf4* \ - | alpha*-dec-osf5.0* \ - | mips-sgi-irix5* \ + mips-sgi-irix5* \ | mips-sgi-irix6.[0-4]* \ | *-*-solaris2.7* \ ) @@ -651,7 +649,7 @@ alpha*-*-openbsd*) target_cpu_default="MASK_GAS" tmake_file="${tmake_file} alpha/t-alpha alpha/t-ieee" ;; -alpha*-dec-osf[45]*) +alpha*-dec-osf5.1*) if test x$stabs = xyes then tm_file="${tm_file} dbx.h" @@ -661,23 +659,11 @@ alpha*-dec-osf[45]*) extra_passes="mips-tfile mips-tdump" fi use_collect2=yes - tmake_file="alpha/t-alpha alpha/t-ieee alpha/t-crtfm alpha/t-osf4" - tm_file="${tm_file} alpha/osf.h" + tmake_file="alpha/t-alpha alpha/t-ieee alpha/t-crtfm alpha/t-osf5" + tm_file="${tm_file} alpha/osf5.h" + tm_defines="${tm_defines} TARGET_SUPPORT_ARCH=1" extra_headers=va_list.h use_gcc_stdint=provide - case ${target} in - *-*-osf4*) - # Define TARGET_SUPPORT_ARCH except on 4.0a. - case ${target} in - *-*-osf4.0a) ;; - *) tm_defines="${tm_defines} TARGET_SUPPORT_ARCH=1" - esac - ;; - *-*-osf5*) - tm_file="${tm_file} alpha/osf5.h" - tm_defines="${tm_defines} TARGET_SUPPORT_ARCH=1" - ;; - esac case ${enable_threads} in "" | yes | posix) thread_file='posix' diff --git a/gcc/config/alpha/osf5.h b/gcc/config/alpha/osf5.h index 67348bb2f97..406eda4c4f3 100644 --- a/gcc/config/alpha/osf5.h +++ b/gcc/config/alpha/osf5.h @@ -238,14 +238,6 @@ __enable_execute_stack (void *addr) \ ? (((GLOBAL) ? DW_EH_PE_indirect : 0) | DW_EH_PE_pcrel | DW_EH_PE_sdata4) \ : DW_EH_PE_aligned) -/* The Tru64 UNIX assembler warns on .lcomm with SIZE 0, so use 1 in that - case. */ -#undef ASM_OUTPUT_LOCAL -#define ASM_OUTPUT_LOCAL(FILE, NAME, SIZE,ROUNDED) \ -( fputs ("\t.lcomm ", (FILE)), \ - assemble_name ((FILE), (NAME)), \ - fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED"\n", (SIZE) ? (SIZE) : 1)) - /* This is how we tell the assembler that a symbol is weak. */ #define ASM_OUTPUT_WEAK_ALIAS(FILE, NAME, VALUE) \ diff --git a/gcc/config/arm/t-netbsd b/gcc/config/arm/t-netbsd deleted file mode 100644 index 22bbbe7dd4b..00000000000 --- a/gcc/config/arm/t-netbsd +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006 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 -# . - -# Just for these, we omit the frame pointer since it makes such a big -# difference. It is then pointless adding debugging. -TARGET_LIBGCC2_CFLAGS = -fomit-frame-pointer -fpic -LIBGCC2_DEBUG_CFLAGS = -g0 -LIB2FUNCS_EXTRA = $(srcdir)/config/floatunsidf.c $(srcdir)/config/floatunsisf.c - -# 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@ - -SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ - -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/doc/install.texi b/gcc/doc/install.texi index c2468dc9e8f..f20c87c0d94 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -2862,7 +2862,7 @@ information are. @item @uref{#alpha-x-x,,alpha*-*-*} @item -@uref{#alpha-dec-osf,,alpha*-dec-osf*} +@uref{#alpha-dec-osf51,,alpha*-dec-osf5.1} @item @uref{#arc-x-elf,,arc-*-elf} @item @@ -3009,16 +3009,15 @@ shared libraries. @html
@end html -@heading @anchor{alpha-dec-osf}alpha*-dec-osf* +@heading @anchor{alpha-dec-osf51}alpha*-dec-osf5.1 Systems using processors that implement the DEC Alpha architecture and are running the DEC/Compaq/HP Unix (DEC OSF/1, Digital UNIX, or Compaq/HP Tru64 UNIX) operating system, for example the DEC Alpha AXP systems. As of GCC 3.2, versions before @code{alpha*-dec-osf4} are no longer supported. (These are the versions which identify themselves as DEC -OSF/1.) As of GCC 4.5, support for Tru64 UNIX V4.0 and V5.0 has been -obsoleted, but can still be enabled by configuring with -@option{--enable-obsolete}. Support will be removed in GCC 4.6. +OSF/1.) As of GCC 4.6, support for Tru64 UNIX V4.0 and V5.0 has been +removed. On Tru64 UNIX, virtual memory exhausted bootstrap failures may be fixed by reconfiguring Kernel Virtual Memory and Swap parameters diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index f314e158228..9aa32c09352 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2010-04-12 Rainer Orth + + * config.host (alpha*-dec-osf[45]*): Removed alpha*-dec-osf4*, + alpha-dec-osf5.0* support. + 2010-04-01 Ralf Corsépius * config.host: Add lm32-*-rtems*. diff --git a/libgcc/config.host b/libgcc/config.host index ecfeb554ae3..0e2046686d8 100644 --- a/libgcc/config.host +++ b/libgcc/config.host @@ -189,7 +189,7 @@ alpha*-*-netbsd*) ;; alpha*-*-openbsd*) ;; -alpha*-dec-osf[45]*) +alpha*-dec-osf5.1*) ;; alpha64-dec-*vms*) tmake_file="vms/t-vms vms/t-vms64 alpha/t-vms" -- 2.11.0