From 814c5e8e2bd2e2fbfe7948a10ff5f59c2266af78 Mon Sep 17 00:00:00 2001 From: ghazi Date: Sat, 10 Nov 2001 04:40:58 +0000 Subject: [PATCH] * config.gcc (i[34567]86-dg-dgux*): Don't set `out_file'. * i386/dgux.h (ASM_FILE_START): Set to the meaningful portions of dgux.c:output_file_start(). * i386/dgux.c: Delete file. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46911 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 9 +++ gcc/config.gcc | 1 - gcc/config/i386/dgux.c | 198 ------------------------------------------------- gcc/config/i386/dgux.h | 12 ++- 4 files changed, 17 insertions(+), 203 deletions(-) delete mode 100644 gcc/config/i386/dgux.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2cb68c6..face7bd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2001-11-09 Kaveh R. Ghazi + + * config.gcc (i[34567]86-dg-dgux*): Don't set `out_file'. + + * i386/dgux.h (ASM_FILE_START): Set to the meaningful portions + of dgux.c:output_file_start(). + + * i386/dgux.c: Delete file. + 2001-11-09 Richard Henderson * config/alpha/alpha.c (decl_in_text_section): New. diff --git a/gcc/config.gcc b/gcc/config.gcc index 97304e2..d439ed9 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -1443,7 +1443,6 @@ i[34567]86-*-interix*) ;; i[34567]86-dg-dgux*) xm_defines=POSIX - out_file=i386/dgux.c tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h i386/dgux.h" tmake_file=i386/t-dgux xmake_file=i386/x-dgux diff --git a/gcc/config/i386/dgux.c b/gcc/config/i386/dgux.c deleted file mode 100644 index e9d2b51..0000000 --- a/gcc/config/i386/dgux.c +++ /dev/null @@ -1,198 +0,0 @@ -/* Subroutines for GNU compiler for Intel 80x86 running DG/ux - Copyright (C) 1993, 1995, 1997, 1999, 2000 Free Software Foundation, Inc. - Currently maintained by (gcc@dg-rtp.dg.com) - -This file is part of GNU CC. - -GNU CC 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 2, or (at your option) -any later version. - -GNU CC 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 GNU CC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -#include -#include "i386/i386.c" - -struct lang_independent_option -{ - char *string; - int *variable; - int on_value; - char *description; -}; - -static int -output_option (file, sep, type, name, indent, pos, max) - FILE *file; - char *sep; - char *type; - char *name; - char *indent; - int pos; - int max; -{ - if (strlen (sep) + strlen (type) + strlen (name) + pos > max) - { - fprintf (file, indent); - return fprintf (file, "%s%s", type, name); - } - return pos + fprintf (file, "%s%s%s", sep, type, name); -} - -static struct { - char *name; - int value; - const char * description; -} m_options[] = TARGET_SWITCHES; - -static void -output_options (file, f_options, f_len, W_options, W_len, - pos, max, sep, indent, term) - FILE *file; - struct lang_independent_option *f_options; - struct lang_independent_option *W_options; - int f_len, W_len; - int pos; - int max; - int sep; - char *indent; - char *term; -{ - register int j; - - if (optimize) - pos = output_option (file, sep, "-O", "", indent, pos, max); - if (write_symbols != NO_DEBUG) - pos = output_option (file, sep, "-g", "", indent, pos, max); -/* if (flag_traditional) - pos = output_option (file, sep, "-traditional", "", indent, pos, max);*/ - if (profile_flag) - pos = output_option (file, sep, "-p", "", indent, pos, max); - if (profile_block_flag) - pos = output_option (file, sep, "-a", "", indent, pos, max); - - for (j = 0; j < f_len; j++) - if (*f_options[j].variable == f_options[j].on_value) - pos = output_option (file, sep, "-f", f_options[j].string, - indent, pos, max); - - for (j = 0; j < W_len; j++) - if (*W_options[j].variable == W_options[j].on_value) - pos = output_option (file, sep, "-W", W_options[j].string, - indent, pos, max); - - for (j = 0; j < ARRAY_SIZE (m_options); j++) - if (m_options[j].name[0] != '\0' - && m_options[j].value > 0 - && ((m_options[j].value & target_flags) - == m_options[j].value)) - pos = output_option (file, sep, "-m", m_options[j].name, - indent, pos, max); - - if (ix86_cpu_string) - pos = output_option (file, sep, "-mcpu=", ix86_cpu_string, - indent, pos, max); - if (ix86_arch_string) - pos = output_option (file, sep, "-march=", ix86_arch_string, - indent, pos, max); - fprintf (file, term); -} - -/* Output to FILE the start of the assembler file. */ - -void -output_file_start (file, f_options, f_len, W_options, W_len) - FILE *file; - struct lang_independent_option *f_options; - struct lang_independent_option *W_options; - int f_len, W_len; -{ - register int pos; - - output_file_directive (file, main_input_filename); - fprintf (file, "\t.version\t\"01.01\"\n"); \ - /* Switch to the data section so that the coffsem symbol - isn't in the text section. */ - data_section (); - - pos = fprintf (file, "\n// cc1 (%s) arguments:", VERSION_STRING); - output_options (file, f_options, f_len, W_options, W_len, - pos, 75, " ", "\n// ", "\n\n"); - -#ifdef TARGET_IDENTIFY_REVISION - if (TARGET_IDENTIFY_REVISION) - { - char indent[256]; - - time_t now = time ((time_t *)0); - sprintf (indent, "]\"\n%s\"@(#)%s [", IDENT_ASM_OP, main_input_filename); - fprintf (file, indent+3); - pos = fprintf (file, "gcc %s, %.24s,", VERSION_STRING, ctime (&now)); - output_options (file, f_options, f_len, W_options, W_len, - pos, 150 - strlen (indent), " ", indent, "]\"\n\n"); - } -#endif /* TARGET_IDENTIFY_REVISION */ -} - -#ifndef CROSS_COMPILE -#if defined (_abort_aux) -/* Debugging aid to be registered via `atexit'. See the definition - of abort in dgux.h. */ -void -abort_aux () -{ - extern int insn_; - extern char * file_; - extern int line_; - static int done; - rtx line_note; - - if (done++) - return; - if (file_ || line_) - { - if (write_symbols != NO_DEBUG) - { - for (line_note = (rtx) insn_ ; line_note != 0 ; line_note = PREV_INSN (line_note)) - if (GET_CODE (line_note) == NOTE && NOTE_LINE_NUMBER (line_note) > 0) - break; - if (line_note != 0) - { - error_with_file_and_line (NOTE_SOURCE_FILE (line_note), - NOTE_LINE_NUMBER (line_note), - "Internal gcc abort from %s:%d", - file_ ? file_ : "", line_); - if (insn_ && file_ && strcmp (file_, "toplev.c")) - { - error_with_file_and_line (NOTE_SOURCE_FILE (line_note), - NOTE_LINE_NUMBER (line_note), - "The local variable `insn' has the value:", 0); - debug_rtx ((rtx) insn_); - } - } - } - if (write_symbols == NO_DEBUG || line_note == 0) - { - error ("Internal gcc abort from %s:%d", - file_ ? file_ : "", line_); - if (insn_ && file_ && strcmp (file_, "toplev.c")) - { - error ("The local variable `insn' has the value:", 0); - debug_rtx ((rtx) insn_); - } - } - } -} -#endif -#endif - - diff --git a/gcc/config/i386/dgux.h b/gcc/config/i386/dgux.h index a9f9593..f1707c1 100644 --- a/gcc/config/i386/dgux.h +++ b/gcc/config/i386/dgux.h @@ -25,7 +25,7 @@ Boston, MA 02111-1307, USA. */ */ #ifndef VERSION_INFO2 -#define VERSION_INFO2 "$Revision: 1.14 $" +#define VERSION_INFO2 "$Revision: 1.15 $" #endif #ifndef VERSION_STRING @@ -81,11 +81,15 @@ Boston, MA 02111-1307, USA. */ #undef PREFERRED_DEBUGGING_TYPE #define PREFERRED_DEBUGGING_TYPE DWARF_DEBUG -/* Override svr[34].h. */ +/* Override svr[34].h. Switch to the data section so that the coffsem + symbol isn't in the text section. */ #undef ASM_FILE_START #define ASM_FILE_START(FILE) \ - output_file_start (FILE, f_options, ARRAY_SIZE (f_options), \ - W_options, ARRAY_SIZE (W_options)) + do { \ + output_file_directive (FILE, main_input_filename); \ + fprintf (FILE, "\t.version\t\"01.01\"\n"); \ + data_section (); \ + } while (0) /* ix86 abi specified type for wchar_t */ -- 2.7.4