From patchwork Wed Jun 11 20:45:57 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Chris Metcalf <cmetcalf@tilera.com>
X-Patchwork-Id: 1452
Received: (qmail 23610 invoked by alias); 11 Jun 2014 20:46:03 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: <mailto:libc-alpha-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 23599 invoked by uid 89); 11 Jun 2014 20:46:02 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00,
	RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2
X-HELO: USMAMAIL.TILERA.COM
Message-ID: <5398C005.3050803@tilera.com>
Date: Wed, 11 Jun 2014 16:45:57 -0400
From: Chris Metcalf <cmetcalf@tilera.com>
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
	rv:24.0) Gecko/20100101 Thunderbird/24.5.0
MIME-Version: 1.0
To: Roland McGrath <roland@hack.frob.com>
CC: "GNU C. Library" <libc-alpha@sourceware.org>
Subject: Re: [PATCH roland/tls-init] Tile: Define TLS_DEFINE_INIT_TP
References: <20140609204547.0A8BE2C39AC@topped-with-meat.com>
	<53972F54.9090405@tilera.com>
	<20140611192908.D24532C39A6@topped-with-meat.com>
In-Reply-To: <20140611192908.D24532C39A6@topped-with-meat.com>

On 6/11/2014 3:29 PM, Roland McGrath wrote:
> Your nptl/ removal all looks good, but I would encourage you to also remove
> the vfork/pt-vfork distinction as we've done for most other machines now.

Something like this?

2014-06-11  Chris Metcalf  <cmetcalf@tilera.com>

         * sysdeps/unix/sysv/linux/tile/pt-vfork.c: New file.
         * sysdeps/unix/sysv/linux/tile/pt-vfork.S: Remove file.
         * sysdeps/unix/sysv/linux/tile/vfork.S (__vfork): Make PT_VFORK
         conditional code always true.
         (__libc_vfork): New alias.

diff --git a/sysdeps/unix/sysv/linux/tile/pt-vfork.S b/sysdeps/unix/sysv/linux/tile/pt-vfork.S
deleted file mode 100644
index a6ccb1f..0000000
--- a/sysdeps/unix/sysv/linux/tile/pt-vfork.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#define PT_VFORK 1   /* pid is never zero */
-#include "vfork.S"
diff --git a/sysdeps/unix/sysv/linux/tile/pt-vfork.c b/sysdeps/unix/sysv/linux/tile/pt-vfork.c
new file mode 100644
index 0000000..5fbc652
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/tile/pt-vfork.c
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/aarch64/pt-vfork.c>
diff --git a/sysdeps/unix/sysv/linux/tile/vfork.S b/sysdeps/unix/sysv/linux/tile/vfork.S
index 014cccf..bf7bdf4 100644
--- a/sysdeps/unix/sysv/linux/tile/vfork.S
+++ b/sysdeps/unix/sysv/linux/tile/vfork.S
@@ -38,9 +38,7 @@ ENTRY (__vfork)
          shli r13, r13, 31              /* Build 0x80000000. */
         }
         sub r12, zero, r12              /* Negate it.  */
-#ifndef PT_VFORK
         CMOVEQZ r12, r12, r13           /* Replace zero pids.  */
-#endif
         ST4 r11, r12                    /* Store the temporary PID.  */

         {
@@ -67,9 +65,7 @@ ENTRY (__vfork)
          CMPEQ r13, r12, r12            /* Test for that value. */
          sub r12, zero, r12             /* Re-negate it.  */
         }
-#ifndef PT_VFORK
         CMOVNEZ r12, r13, zero          /* Replace zero pids.  */
-#endif
         ST4 r11, r12                    /* Restore the PID.  */
  1:
         BNEZ r1, 0f
@@ -78,3 +74,4 @@ PSEUDO_END (__vfork)
  libc_hidden_def (__vfork)

  weak_alias (__vfork, vfork)
+strong_alias (__vfork, __libc_vfork)