From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17172 invoked by alias); 6 Dec 2012 17:37:06 -0000 Received: (qmail 17160 invoked by uid 22791); 6 Dec 2012 17:37:05 -0000 X-SWARE-Spam-Status: No, hits=-6.9 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_SPAMHAUS_DROP,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,RP_MATCHES_RCVD,SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 06 Dec 2012 17:36:55 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qB6HasYU029215 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 6 Dec 2012 12:36:55 -0500 Received: from brno.lan (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qB6HarT5024132 for ; Thu, 6 Dec 2012 12:36:54 -0500 Subject: [PATCH] solib-svr4.c: Remove old SCO-related code. To: gdb-patches@sourceware.org From: Pedro Alves Date: Thu, 06 Dec 2012 17:37:00 -0000 Message-ID: <20121206173653.15629.99432.stgit@brno.lan> User-Agent: StGit/0.16 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-12/txt/msg00110.txt.bz2 Support for SCO has been removed in 2007, by: http://sourceware.org/ml/gdb-patches/2007-03/msg00327.html But this bit in svr4_solib_create_inferior_hook remains left behind. Let me know if I missed anything, like a supported non-SCO target actually defining _SCO_DS too, though that sounds very unlikely to me. I notice that unixware support has also been dropped in that same 2007 change, so it seems like all the #ifdef UNIXWARE checks in procfs.c could be removed too, along with the "*-*-unixware*" check in configure.ac. 2012-12-06 Pedro Alves * solib-svr4.c (svr4_solib_create_inferior_hook) [_SCO_DS]: Remove dead SCO code, and adjust function description comment. --- gdb/solib-svr4.c | 41 +---------------------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index 02e45a3..316c1b7 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -2212,25 +2212,11 @@ svr4_relocate_main_executable (void) This function is responsible for discovering those names and addresses, and saving sufficient information about them to allow - their symbols to be read at a later time. - - FIXME - - Between enable_break() and disable_break(), this code does not - properly handle hitting breakpoints which the user might have - set in the startup code or in the dynamic linker itself. Proper - handling will probably have to wait until the implementation is - changed to use the "breakpoint handler function" method. - - Also, what if child has exit()ed? Must exit loop somehow. */ + their symbols to be read at a later time. */ static void svr4_solib_create_inferior_hook (int from_tty) { -#if defined(_SCO_DS) - struct inferior *inf; - struct thread_info *tp; -#endif /* defined(_SCO_DS) */ struct svr4_info *info; info = get_svr4_info (); @@ -2248,31 +2234,6 @@ svr4_solib_create_inferior_hook (int from_tty) if (!enable_break (info, from_tty)) return; - -#if defined(_SCO_DS) - /* SCO needs the loop below, other systems should be using the - special shared library breakpoints and the shared library breakpoint - service routine. - - Now run the target. It will eventually hit the breakpoint, at - which point all of the libraries will have been mapped in and we - can go groveling around in the dynamic linker structures to find - out what we need to know about them. */ - - inf = current_inferior (); - tp = inferior_thread (); - - clear_proceed_status (); - inf->control.stop_soon = STOP_QUIETLY; - tp->suspend.stop_signal = GDB_SIGNAL_0; - do - { - target_resume (pid_to_ptid (-1), 0, tp->suspend.stop_signal); - wait_for_inferior (); - } - while (tp->suspend.stop_signal != GDB_SIGNAL_TRAP); - inf->control.stop_soon = NO_STOP_QUIETLY; -#endif /* defined(_SCO_DS) */ } static void