From a144af6c5a5f30a92750a5da9729ce680e1054a0 Mon Sep 17 00:00:00 2001 From: Marc Espie Date: Wed, 19 Jan 2000 16:26:42 +0000 Subject: Inane conflicts: - patch to function.c was badly indented. - invoke.texi no longer need to special-case OpenBSD, as 2.95.2 turns strict-aliasing off everywhere. --- gnu/egcs/gcc/config/i386/i386.c | 5 +++++ gnu/egcs/gcc/config/i386/sol2dbg.h | 27 --------------------------- gnu/egcs/gcc/configure | 19 ++++++++++++++----- gnu/egcs/gcc/configure.in | 19 ++++++++++++++----- gnu/egcs/gcc/function.c | 6 +++--- gnu/egcs/gcc/invoke.texi | 15 +++++++-------- 6 files changed, 43 insertions(+), 48 deletions(-) delete mode 100644 gnu/egcs/gcc/config/i386/sol2dbg.h diff --git a/gnu/egcs/gcc/config/i386/i386.c b/gnu/egcs/gcc/config/i386/i386.c index cfd95e4880c..67c01ae60bc 100644 --- a/gnu/egcs/gcc/config/i386/i386.c +++ b/gnu/egcs/gcc/config/i386/i386.c @@ -5234,6 +5234,9 @@ output_strlen_unroll (operands) output_asm_insn (AS1 (je,%l12), xops); output_asm_insn (AS1 (inc%L0,%0), xops); + /* Not needed with an alignment of 2 */ + if (GET_CODE (operands[1]) != CONST_INT || INTVAL (operands[1]) != 2) + { ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L", CODE_LABEL_NUMBER (xops[7])); output_asm_insn (AS2 (cmp%B13,%2,%13), xops); @@ -5242,6 +5245,8 @@ output_strlen_unroll (operands) ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L", CODE_LABEL_NUMBER (xops[6])); + } + output_asm_insn (AS2 (cmp%B13,%2,%13), xops); } diff --git a/gnu/egcs/gcc/config/i386/sol2dbg.h b/gnu/egcs/gcc/config/i386/sol2dbg.h deleted file mode 100644 index 9f95333b4b9..00000000000 --- a/gnu/egcs/gcc/config/i386/sol2dbg.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Target definitions for GNU compiler for Intel 80386 running Solaris - with gas and gdb. - This file is added into the directory .../gcc-2.../config/i386 - Workability without "#undef DWARF_DEBUGGING_INFO" is not tested. */ - -/* Use stabs instead of DWARF debug format. */ -#ifdef PREFERRED_DEBUGGING_TYPE -#undef PREFERRED_DEBUGGING_TYPE -#endif -#define PREFERRED_DEBUGGING_TYPE DBX_DEBUG - -#include "i386/sol2.h" - -#ifdef DWARF_DEBUGGING_INFO -#undef DWARF_DEBUGGING_INFO -#endif - -/* - Changed from config/svr4.h in the following ways: - - - Added "%{V}". - - Modified "{%v:-V}" to take into account "%{V}". - - Added "-s" so that stabs are saved in the final executable. */ - -#undef ASM_SPEC -#define ASM_SPEC \ - "%{V} %{v:%{!V:-V}} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} %{Wa,*:%*} -s" diff --git a/gnu/egcs/gcc/configure b/gnu/egcs/gcc/configure index cbdf8c5b33e..beebc76500c 100644 --- a/gnu/egcs/gcc/configure +++ b/gnu/egcs/gcc/configure @@ -3750,9 +3750,9 @@ for machine in $build $host $target; do i[34567]86-*-solaris2*) xm_file="xm-siglist.h xm-alloca.h ${xm_file}" xm_defines="USG POSIX SMALL_ARG_MAX" - if test x$stabs = xyes - then - tm_file=i386/sol2dbg.h + if test x$gas = xyes; then + # Only needed if gas does not support -s + tm_file=i386/sol2gas.h else tm_file=i386/sol2.h fi @@ -5407,12 +5407,21 @@ for machine in $build $host $target; do fi ;; sparc-hal-solaris2*) - xm_file=sparc/xm-sol2.h + xm_file="xm-siglist.h sparc/xm-sysv4.h sparc/xm-sol2.h" + xm_defines="USG POSIX" tm_file="sparc/sol2.h sparc/hal.h" tmake_file="sparc/t-halos sparc/t-sol2" xmake_file=sparc/x-sysv4 extra_parts="crt1.o crti.o crtn.o gmon.o crtbegin.o crtend.o" - broken_install=yes + case $machine in + *-*-solaris2.[0-4]) + float_format=i128 + ;; + *) + float_format=none + ;; + esac + thread_file='solaris' ;; sparc-*-solaris2*) if test x$gnu_ld = xyes diff --git a/gnu/egcs/gcc/configure.in b/gnu/egcs/gcc/configure.in index 5b03ba93921..bdf4348a2fe 100644 --- a/gnu/egcs/gcc/configure.in +++ b/gnu/egcs/gcc/configure.in @@ -1399,9 +1399,9 @@ changequote(,)dnl changequote([,])dnl xm_file="xm-siglist.h xm-alloca.h ${xm_file}" xm_defines="USG POSIX SMALL_ARG_MAX" - if test x$stabs = xyes - then - tm_file=i386/sol2dbg.h + if test x$gas = xyes; then + # Only needed if gas does not support -s + tm_file=i386/sol2gas.h else tm_file=i386/sol2.h fi @@ -3102,12 +3102,21 @@ changequote([,])dnl fi ;; sparc-hal-solaris2*) - xm_file=sparc/xm-sol2.h + xm_file="xm-siglist.h sparc/xm-sysv4.h sparc/xm-sol2.h" + xm_defines="USG POSIX" tm_file="sparc/sol2.h sparc/hal.h" tmake_file="sparc/t-halos sparc/t-sol2" xmake_file=sparc/x-sysv4 extra_parts="crt1.o crti.o crtn.o gmon.o crtbegin.o crtend.o" - broken_install=yes + case $machine in + *-*-solaris2.[0-4]) + float_format=i128 + ;; + *) + float_format=none + ;; + esac + thread_file='solaris' ;; sparc-*-solaris2*) if test x$gnu_ld = xyes diff --git a/gnu/egcs/gcc/function.c b/gnu/egcs/gcc/function.c index d2cf4c2edfb..5592e482e2f 100644 --- a/gnu/egcs/gcc/function.c +++ b/gnu/egcs/gcc/function.c @@ -1031,9 +1031,9 @@ assign_stack_temp_for_type (mode, size, keep, type) if (mode == BLKmode && align < BIGGEST_ALIGNMENT) abort(); p->slot = assign_stack_local (mode, - (mode == BLKmode - ? CEIL_ROUND (size, align / BITS_PER_UNIT) - : size), + (mode == BLKmode + ? CEIL_ROUND (size, align / BITS_PER_UNIT) + : size), align); p->align = align; diff --git a/gnu/egcs/gcc/invoke.texi b/gnu/egcs/gcc/invoke.texi index b93acd808fc..230174c036c 100644 --- a/gnu/egcs/gcc/invoke.texi +++ b/gnu/egcs/gcc/invoke.texi @@ -2202,11 +2202,10 @@ perform loop unrolling or function inlining when you specify @samp{-O2}. As compared to @samp{-O}, this option increases both compilation time and the performance of the generated code. -@samp{-O2} turns on all optional optimizations except for loop unrolling -and function inlining. It also turns on the @samp{-fforce-mem} option -on all machines and frame pointer elimination on machines where doing so -does not interfere with debugging. -It does not turn on @samp{-fstrict-aliasing} on OpenBSD platforms. +@samp{-O2} turns on all optional optimizations except for loop unrolling, +function inlining, and strict aliasing optimizations. It also turns on the +@samp{-fforce-mem} option on all machines and frame pointer elimination on +machines where doing so does not interfere with debugging. @item -O3 Optimize yet more. @samp{-O3} turns on all optimizations specified by @@ -2364,9 +2363,9 @@ math functions. @c --mew 26jan93 The following options control specific optimizations. The @samp{-O2} option turns on all of these optimizations except @samp{-funroll-loops} -and @samp{-funroll-all-loops}. On most machines, the @samp{-O} option -turns on the @samp{-fthread-jumps} and @samp{-fdelayed-branch} options, -but specific machines may handle it differently. +@samp{-funroll-all-loops}, and @samp{-fstrict-aliasing}. On most machines, the +@samp{-O} option turns on the @samp{-fthread-jumps} and @samp{-fdelayed-branch} +options, but specific machines may handle it differently. You can use the following flags in the rare cases when ``fine-tuning'' of optimizations to be performed is desired. -- cgit v1.2.3