From 655ae828ee2810a2247d859d1975c4f523632fd3 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iains@gcc.gnu.org>
Date: Sat, 24 Sep 2011 20:25:42 +0000
Subject: [PATCH] ada, remove flat_namespace library option from darwin port
 build/defaults :

	* gcc-interface/Makefile.in (darwin): Do not issue the
	'-flat_namespace' linker flag during Ada build.
	* mlib-tgt-specific-darwin.adb: Remove '-flat_namespace' flag from the
	default shared library options.

From-SVN: r179148
---
 gcc/ada/ChangeLog                    | 7 +++++++
 gcc/ada/gcc-interface/Makefile.in    | 2 +-
 gcc/ada/mlib-tgt-specific-darwin.adb | 7 +------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 1d0a10cf32e..3606791f1c4 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,10 @@
+2011-09-24  Iain Sandoe  <iains@gcc.gnu.org>
+
+	* gcc-interface/Makefile.in (darwin): Do not issue the
+	'-flat_namespace' linker flag during Ada build.
+	* mlib-tgt-specific-darwin.adb: Remove '-flat_namespace' flag from the
+	default shared library options.
+
 2011-09-19  Alexandre Oliva  <aoliva@redhat.com>
 
 	* gcc-interface/decl.c (annotate_value): Look up expression for
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 6f8cf3b4beb..db7f563e13d 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -2164,7 +2164,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(arch) $(osys))),)
 endif
 
 ifeq ($(strip $(filter-out darwin%,$(osys))),)
-  SO_OPTS = -Wl,-flat_namespace -shared-libgcc
+  SO_OPTS = -shared-libgcc
   ifeq ($(strip $(filter-out %86,$(arch))),)
     LIBGNAT_TARGET_PAIRS = \
     a-intnam.ads<a-intnam-darwin.ads \
diff --git a/gcc/ada/mlib-tgt-specific-darwin.adb b/gcc/ada/mlib-tgt-specific-darwin.adb
index 5bab21df797..e04225370eb 100644
--- a/gcc/ada/mlib-tgt-specific-darwin.adb
+++ b/gcc/ada/mlib-tgt-specific-darwin.adb
@@ -57,15 +57,10 @@ package body MLib.Tgt.Specific is
 
    --  Local objects
 
-   Flat_Namespace : aliased String := "-Wl,-flat_namespace";
-   --  Instruct the linker to build the shared library as a flat
-   --  namespace image. The default is a two-level namespace image.
-
    Shared_Libgcc  : aliased String := "-shared-libgcc";
 
    Shared_Options : constant Argument_List :=
-                      (1 => Flat_Namespace'Access,
-                       2 => Shared_Libgcc'Access);
+                      (1 => Shared_Libgcc'Access);
 
    -----------------------------
    -- Archive_Indexer_Options --
-- 
2.30.2