From patchwork Fri Jan 14 00:12:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 78843 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 39115B70D5 for ; Fri, 14 Jan 2011 11:12:56 +1100 (EST) Received: (qmail 19052 invoked by alias); 14 Jan 2011 00:12:53 -0000 Received: (qmail 19044 invoked by uid 22791); 14 Jan 2011 00:12:52 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (38.113.113.100) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 14 Jan 2011 00:12:48 +0000 Received: (qmail 14201 invoked from network); 14 Jan 2011 00:12:46 -0000 Received: from unknown (HELO digraph.polyomino.org.uk) (joseph@127.0.0.2) by mail.codesourcery.com with ESMTPA; 14 Jan 2011 00:12:46 -0000 Received: from jsm28 (helo=localhost) by digraph.polyomino.org.uk with local-esmtp (Exim 4.72) (envelope-from ) id 1PdXHZ-0002RS-Lr; Fri, 14 Jan 2011 00:12:45 +0000 Date: Fri, 14 Jan 2011 00:12:45 +0000 (UTC) From: "Joseph S. Myers" To: gcc-patches@gcc.gnu.org cc: geoffk@geoffk.org, dje.gcc@gmail.com Subject: [15/25] Specs cleanup: config/rs6000/sysv4.h SHARED_LIB_SUPPORT In-Reply-To: Message-ID: References: MIME-Version: 1.0 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org config/rs6000/sysv4.h has a conditional on SHARED_LIB_SUPPORT, which is nowhere defined. Removing this allows a conditional definition of LINK_SHLIB_SPEC to be removed, which this patch does. OK to commit? 2011-01-13 Joseph Myers * config/rs6000/sysv4.h (SHARED_LIB_SUPPORT): Remove conditional. (NO_SHARED_LIB_SUPPORT): Remove. (LINK_SHLIB_SPEC): Remove one conditional definition. diff -rupN --exclude=.svn gcc-mainline-14/gcc/config/rs6000/sysv4.h gcc-mainline/gcc/config/rs6000/sysv4.h --- gcc-mainline-14/gcc/config/rs6000/sysv4.h 2010-12-20 13:12:12.000000000 -0800 +++ gcc-mainline/gcc/config/rs6000/sysv4.h 2011-01-12 14:36:47.000000000 -0800 @@ -642,21 +642,6 @@ extern int fixuplabelno; %(link_target) \ %(link_os)" -/* For now, turn off shared libraries by default. */ -#ifndef SHARED_LIB_SUPPORT -#define NO_SHARED_LIB_SUPPORT -#endif - -#ifndef NO_SHARED_LIB_SUPPORT -/* Shared libraries are default. */ -#define LINK_SHLIB_SPEC "\ -%{!static: %(link_path) %{!R*:%{L*:-R %*}}} \ -%{mshlib: } \ -%{static:-dn -Bstatic} \ -%{shared:-G -dy -z text} \ -%{symbolic:-Bsymbolic -G -dy -z text}" - -#else /* Shared libraries are not default. */ #define LINK_SHLIB_SPEC "\ %{mshlib: %(link_path) } \ @@ -664,7 +649,6 @@ extern int fixuplabelno; %{static: } \ %{shared:-G -dy -z text %(link_path) } \ %{symbolic:-Bsymbolic -G -dy -z text %(link_path) }" -#endif /* Override the default target of the linker. */ #define LINK_TARGET_SPEC "\