From patchwork Fri Jun 5 22:40:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: DJ Delorie X-Patchwork-Id: 481585 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C8364140281 for ; Sat, 6 Jun 2015 08:40:49 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=UurpGSAX; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :message-id:from:to:subject; q=dns; s=default; b=twr6vxmFWLMFKus dFBi5SR5TJ02VaAWi7rV39c4T94H2mOuGqEP3Au8v9P/CTrJgrgz+P3iGM+eZmrj KXe5ywHWHRL/oYUwcgFO2wuEN0sTB+xtfh8R4lQdFaQ3JjyVeV8eHx8ZvnS+2RyF gP6zaFxRSDpF4fcvL5NLu5F1lPQo= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :message-id:from:to:subject; s=default; bh=vXcFiqHuU5UMxUt3PrtMu P2kFC8=; b=UurpGSAXKAcHHGO7B1mKJFcXoLhNb4MugnZQ4uXx2krzv87t43f9K iiT3ew1uPNAiUcib8RJa7QjykKQEk0bZY6CbRz7sgOFZEqGW6IsMW7gtotGBHgWu WGuzlpdJR2lsltvwvTHCihAlSbC3g0I1YA3/bQ1M8MW2xCzMXn6Hu0= Received: (qmail 83444 invoked by alias); 5 Jun 2015 22:40:42 -0000 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 Received: (qmail 83432 invoked by uid 89); 5 Jun 2015 22:40:41 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL, BAYES_50, KAM_LAZY_DOMAIN_SECURITY, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=no version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Fri, 05 Jun 2015 22:40:40 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 5B9082DC3F7 for ; Fri, 5 Jun 2015 22:40:39 +0000 (UTC) Received: from greed.delorie.com (ovpn-113-25.phx2.redhat.com [10.3.113.25]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t55MecVw021926 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Fri, 5 Jun 2015 18:40:39 -0400 Received: from greed.delorie.com (greed.delorie.com [127.0.0.1]) by greed.delorie.com (8.14.4/8.14.4) with ESMTP id t55Meb80024721; Fri, 5 Jun 2015 18:40:37 -0400 Received: (from dj@localhost) by greed.delorie.com (8.14.4/8.14.4/Submit) id t55Mebfa024719; Fri, 5 Jun 2015 18:40:37 -0400 Date: Fri, 5 Jun 2015 18:40:37 -0400 Message-Id: <201506052240.t55Mebfa024719@greed.delorie.com> From: DJ Delorie To: gcc-patches@gcc.gnu.org Subject: [s390] Revert TPF C++ library changes X-IsSubscribed: yes IBM made changes to no longer require 2 versions of libstdc++, so this patch changes things back to the previous (compatible) way. Also, TPF debuggers don't support discriminators, despite what GAS supports, so disable them. Ok? * config/s390/tpf.h (LIBSTDCXX): Change to CPP1. (LIB_SPEC): Add. (SUPPORTS_DISCRIMINATOR): Define. Index: config/s390/tpf.h =================================================================== --- config/s390/tpf.h (revision 224174) +++ config/s390/tpf.h (working copy) @@ -91,12 +91,16 @@ along with GCC; see the file COPYING3. #define CPLUSPLUS_CPP_SPEC "-D_GNU_SOURCE %(cpp)" #undef ASM_SPEC #define ASM_SPEC "%{m31&m64}%{mesa&mzarch}%{march=*} \ -alshd=%b.lst" +#undef LIB_SPEC +#define LIB_SPEC "-lCTIS -lCISO -lCLBM -lCTAL -lCFVS -lCTBX -lCTXO \ + -lCJ00 -lCTDF -lCOMX -lCOMS -lCTHD -lCTAD -lTPFSTUB" + #define ENTRY_SPEC "%{mmain:-entry=_start} \ %{!mmain:-entry=0}" /* All linking is done shared on TPF-OS. */ /* FIXME: When binutils patch for new emulation is committed then change emulation to elf64_s390_tpf. */ @@ -107,12 +111,15 @@ along with GCC; see the file COPYING3. %{shared: -shared} \ %{!shared:-shared} \ %(entry_spec)" /* IBM copies these libraries over with these names. */ #define MATH_LIBRARY "CLBM" -#define LIBSTDCXX "CPP2" +#define LIBSTDCXX "CPP1" #undef TARGET_LIBC_HAS_FUNCTION #define TARGET_LIBC_HAS_FUNCTION gnu_libc_has_function +/* GAS supports it, but the debuggers don't, so avoid it. */ +#define SUPPORTS_DISCRIMINATOR 0 + #endif /* ! _TPF_H */