From 22f70bffdd485129dfdba38a880b22781449269e Mon Sep 17 00:00:00 2001
From: Geoffrey Keating <geoffk@apple.com>
Date: Mon, 2 Jul 2007 19:36:14 +0000
Subject: [PATCH] darwin9.h: Add copyright notice.

	* config/darwin9.h: Add copyright notice.
	(LINK_COMMAND_SPEC): Add comment.
	(DARWIN_LIBSYSTEM_HAS_UNWIND): Define.
	* config/rs6000/darwin.h (MD_UNWIND_SUPPORT): Conditionalise on
	DARWIN_LIBSYSTEM_HAS_UNWIND.

From-SVN: r126229
---
 gcc/ChangeLog              |  8 ++++++++
 gcc/config/darwin9.h       | 25 +++++++++++++++++++++++++
 gcc/config/rs6000/darwin.h |  2 +-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 164af0368be..d0fc5beb151 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2007-07-02  Geoffrey Keating  <geoffk@apple.com>
+
+	* config/darwin9.h: Add copyright notice.
+	(LINK_COMMAND_SPEC): Add comment.
+	(DARWIN_LIBSYSTEM_HAS_UNWIND): Define.
+	* config/rs6000/darwin.h (MD_UNWIND_SUPPORT): Conditionalise on
+	DARWIN_LIBSYSTEM_HAS_UNWIND.
+
 2007-07-02  Jakub Jelinek  <jakub@redhat.com>
 
 	PR libgomp/32468
diff --git a/gcc/config/darwin9.h b/gcc/config/darwin9.h
index bda03a6c6fc..598ad739680 100644
--- a/gcc/config/darwin9.h
+++ b/gcc/config/darwin9.h
@@ -1,8 +1,30 @@
+/* Target definitions for Darwin (Mac OS X) systems.
+   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+   Contributed by Apple 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 2, 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 COPYING.  If not, write to
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
 /* Prefer DWARF2.  */
 #undef PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
 #define DARWIN_PREFER_DWARF
 
+/* Since DWARF2 is default, conditions for running dsymutil are different.  */
 #undef LINK_COMMAND_SPEC
 #define LINK_COMMAND_SPEC "\
 %{!fdump=*:%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\
@@ -18,6 +40,9 @@
     %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm: \
     %{g*:%{!gstabs*:%{!g0: dsymutil %{o*:%*}%{!o:a.out}}}}}}}}}}}}"
 
+/* libSystem contains unwind information for signal frames.  */
+#define DARWIN_LIBSYSTEM_HAS_UNWIND
+
 /* The linker can generate branch islands.  */
 #define DARWIN_LINKER_GENERATES_ISLANDS 1
 
diff --git a/gcc/config/rs6000/darwin.h b/gcc/config/rs6000/darwin.h
index acf8b4e0e33..c96c2eeae00 100644
--- a/gcc/config/rs6000/darwin.h
+++ b/gcc/config/rs6000/darwin.h
@@ -405,7 +405,7 @@
 #include <stdbool.h>
 #endif
 
-#ifndef __LP64__
+#if !defined(__LP64__) && !defined(DARWIN_LIBSYSTEM_HAS_UNWIND)
 #define MD_UNWIND_SUPPORT "config/rs6000/darwin-unwind.h"
 #endif