backport: re PR target/31868 (Non-Linux DWARF EH x86-64 targets have broken crtend.o)

2008-02-10  H.J. Lu  <hongjiu.lu@intel.com>

	Backport from mainline:
	2007-08-06  H.J. Lu  <hongjiu.lu@intel.com>
		    Daniel Jacobowitz  <dan@codesourcery.com>

	PR target/31868
	* config.gcc (x86_64-*-freebsd*): Add i386/t-crtstuff to
	tmake_file.
	(x86_64-*-netbsd*): Likewise.
	(x86_64-*-linux*): Likewise.
	(x86_64-*-kfreebsd*-gnu): Likewise.
	(x86_64-*-knetbsd*-gnu): Likewise.
	(i[34567]86-*-solaris2.1[0-9]*): Likewise.

	* config/i386/t-linux64 (CRTSTUFF_T_CFLAGS): Removed.

	* config/i386/t-crtstuff (CRTSTUFF_T_CFLAGS): Update comments.
	Add -fno-asynchronous-unwind-tables.

	* config/t-freebsd (CRTSTUFF_T_CFLAGS_S): Add $(CRTSTUFF_T_CFLAGS).
	* config/t-libc-ok (CRTSTUFF_T_CFLAGS_S): Likewise.
	* config/t-lynx (CRTSTUFF_T_CFLAGS_S): Likewise.
	* config/t-netbsd (CRTSTUFF_T_CFLAGS_S): Likewise.
	* config/t-svr4 (CRTSTUFF_T_CFLAGS_S): Likewise.

From-SVN: r132222

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c91473c67e62857107472dd75495b01b35db75c0..7ae96c66b329d2218c2d805619083ddbec5a41c4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,29 @@
+2008-02-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+       Backport from mainline:
+       2007-08-06  H.J. Lu  <hongjiu.lu@intel.com>
+                   Daniel Jacobowitz  <dan@codesourcery.com>
+
+       PR target/31868
+       * config.gcc (x86_64-*-freebsd*): Add i386/t-crtstuff to
+       tmake_file.
+       (x86_64-*-netbsd*): Likewise.
+       (x86_64-*-linux*): Likewise.
+       (x86_64-*-kfreebsd*-gnu): Likewise.
+       (x86_64-*-knetbsd*-gnu): Likewise.
+       (i[34567]86-*-solaris2.1[0-9]*): Likewise.
+
+       * config/i386/t-linux64 (CRTSTUFF_T_CFLAGS): Removed.
+
+       * config/i386/t-crtstuff (CRTSTUFF_T_CFLAGS): Update comments.
+       Add -fno-asynchronous-unwind-tables.
+
+       * config/t-freebsd (CRTSTUFF_T_CFLAGS_S): Add $(CRTSTUFF_T_CFLAGS).
+       * config/t-libc-ok (CRTSTUFF_T_CFLAGS_S): Likewise.
+       * config/t-lynx (CRTSTUFF_T_CFLAGS_S): Likewise.
+       * config/t-netbsd (CRTSTUFF_T_CFLAGS_S): Likewise.
+       * config/t-svr4 (CRTSTUFF_T_CFLAGS_S): Likewise.
+
 2008-02-09  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
        PR middle_end/34150

diff --git a/gcc/config.gcc b/gcc/config.gcc
index f495ef451d9bd6dde74cf508e221806f19add58b..28d3e73ea42115943bd7a3d96441760ef2969512 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1061,6 +1061,7 @@ i[34567]86-*-freebsd*)
        ;;
 x86_64-*-freebsd*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/x86-64.h i386/freebsd.h i386/freebsd64.h"
+       tmake_file="${tmake_file} i386/t-crtstuff"
        ;;
 i[34567]86-*-netbsdelf*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h"
@@ -1073,6 +1074,7 @@ i[34567]86-*-netbsd*)
        ;;
 x86_64-*-netbsd*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/x86-64.h i386/netbsd64.h"
+       tmake_file="${tmake_file} i386/t-crtstuff"
        ;;
 i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
        tm_file="i386/i386.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h openbsd-oldgas.h openbsd.h i386/openbsd.h"
@@ -1108,7 +1110,7 @@ x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu)
        x86_64-*-kfreebsd*-gnu) tm_file="${tm_file} kfreebsd-gnu.h" ;;
        x86_64-*-knetbsd*-gnu) tm_file="${tm_file} knetbsd-gnu.h" ;;
        esac
-       tmake_file="${tmake_file} i386/t-linux64 i386/t-crtfm t-dfprules"
+       tmake_file="${tmake_file} i386/t-linux64 i386/t-crtstuff i386/t-crtfm t-dfprules"
        ;;
 i[34567]86-*-gnu*)
        ;;
@@ -1205,7 +1207,7 @@ i[34567]86-*-solaris2*)
        *-*-solaris2.1[0-9]*)
                tm_file="${tm_file} i386/x86-64.h i386/sol2-10.h"
                tm_defines="${tm_defines} TARGET_BI_ARCH=1"
-               tmake_file="$tmake_file i386/t-sol2-10"
+               tmake_file="$tmake_file i386/t-crtstuff i386/t-sol2-10"
                need_64bit_hwint=yes
                # FIXME: -m64 for i[34567]86-*-* should be allowed just
                # like -m32 for x86_64-*-*.

diff --git a/gcc/config/i386/t-crtstuff b/gcc/config/i386/t-crtstuff
index a202df6653f6ec664030bfb3b38167fb3a38b7f9..c14dd9411ae436d4e977f64795411539a78fa363 100644 (file)
--- a/gcc/config/i386/t-crtstuff
+++ b/gcc/config/i386/t-crtstuff
@@ -1,2 +1,7 @@
 # The pushl in CTOR initialization interferes with frame pointer elimination.
-CRTSTUFF_T_CFLAGS = -fno-omit-frame-pointer
+# crtend*.o cannot be compiled without -fno-asynchronous-unwind-tables,
+# because then __FRAME_END__ might not be the last thing in .eh_frame
+# section.  -fno-asynchronous-unwind-tables is off by default for i386
+# and is on by default for x86-64.  We turn it off for both i386 and
+# x86-64.
+CRTSTUFF_T_CFLAGS += -fno-omit-frame-pointer -fno-asynchronous-unwind-tables

diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
index aac59a08e36840fa0609a419e24f097520127a1b..5b125a64a4a0910d2e9a8895da30e2cc721f92e3 100644 (file)
--- a/gcc/config/i386/t-linux64
+++ b/gcc/config/i386/t-linux64
@@ -13,9 +13,3 @@ INSTALL_LIBGCC = install-multilib
 
 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o \
                     crtbeginT.o crtfastmath.o
-
-# The pushl in CTOR initialization interferes with frame pointer elimination.
-# crtend*.o cannot be compiled without -fno-asynchronous-unwind-tables,
-# because then __FRAME_END__ might not be the last thing in .eh_frame
-# section.
-CRTSTUFF_T_CFLAGS = -fno-omit-frame-pointer -fno-asynchronous-unwind-tables

diff --git a/gcc/config/t-freebsd b/gcc/config/t-freebsd
index 211dbdf6b71811227ce2b82afdca67c354cafefd..0680618a6ec703efec0d50f05def28eda7ce1458 100644 (file)
--- a/gcc/config/t-freebsd
+++ b/gcc/config/t-freebsd
@@ -1,5 +1,5 @@
 # Compile crtbeginS.o and crtendS.o with pic.
-CRTSTUFF_T_CFLAGS_S = -fPIC
+CRTSTUFF_T_CFLAGS_S = $(CRTSTUFF_T_CFLAGS) -fPIC
 
 # Compile libgcc.a with pic.
 TARGET_LIBGCC2_CFLAGS += -fPIC

diff --git a/gcc/config/t-libc-ok b/gcc/config/t-libc-ok
index 4dae812ae314024bac449fc172bdf277f35027be..561ee0b31d17050d6bf55315211d1089aeffb251 100644 (file)
--- a/gcc/config/t-libc-ok
+++ b/gcc/config/t-libc-ok
@@ -1 +1 @@
-CRTSTUFF_T_CFLAGS_S=-fPIC
+CRTSTUFF_T_CFLAGS_S = $(CRTSTUFF_T_CFLAGS) -fPIC

diff --git a/gcc/config/t-lynx b/gcc/config/t-lynx
index a14a53c614eb3d7ad30461246e274449e428e462..3a6a5d871e4800499e0352b99727d125b50069b0 100644 (file)
--- a/gcc/config/t-lynx
+++ b/gcc/config/t-lynx
@@ -1,5 +1,5 @@
 # Compile crtbeginS.o and crtendS.o with pic.
-CRTSTUFF_T_CFLAGS_S = -fPIC
+CRTSTUFF_T_CFLAGS_S = $(CRTSTUFF_T_CFLAGS) -fPIC
 
 # Compile libgcc2.a with pic.
 TARGET_LIBGCC2_CFLAGS = -fPIC

diff --git a/gcc/config/t-netbsd b/gcc/config/t-netbsd
index 843e4100df767b84bc1881302ef5f65ee53bdd43..34949e12858ccc0325fccb0ff8c4493b6c2162a8 100644 (file)
--- a/gcc/config/t-netbsd
+++ b/gcc/config/t-netbsd
@@ -1,2 +1,2 @@
 # Always build crtstuff with PIC.
-CRTSTUFF_T_CFLAGS = -fPIC
+CRTSTUFF_T_CFLAGS_S = $(CRTSTUFF_T_CFLAGS) -fPIC

diff --git a/gcc/config/t-svr4 b/gcc/config/t-svr4
index 52c9b28fc9a8d432a4122027d53428c7df7265f9..3ea1174580dccb5c949d9d417f57711ee7861e8e 100644 (file)
--- a/gcc/config/t-svr4
+++ b/gcc/config/t-svr4
@@ -4,7 +4,7 @@
 # we will be doing that, we just always use -fPIC when compiling the
 # routines in crtstuff.c.  Likewise for libgcc2.c.
 
-CRTSTUFF_T_CFLAGS = -fPIC
+CRTSTUFF_T_CFLAGS_S = $(CRTSTUFF_T_CFLAGS) -fPIC
 TARGET_LIBGCC2_CFLAGS = -fPIC
 
 # See all the declarations.