From patchwork Fri Sep  7 07:06:22 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Terry Guo <terry.xpguo@gmail.com>
X-Patchwork-Id: 29231
Received: (qmail 89349 invoked by alias); 7 Sep 2018 07:06:26 -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 89335 invoked by uid 89); 7 Sep 2018 07:06:25 -0000
Authentication-Results: sourceware.org; auth=none
X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=AWL, BAYES_00,
	FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2,
	GIT_PATCH_3, RCVD_IN_DNSWL_NONE,
	SPF_PASS autolearn=ham version=3.3.2 spammy=fulfill, 5210,
	Hx-languages-length:1106, H*r:a17
X-HELO: mail-pg1-f195.google.com
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=gmail.com; s=20161025;
	h=mime-version:from:date:message-id:subject:to:cc;
	bh=b2guxg+mWaFci99/Feqnd6khCOCSMkQXJEC65BRXbk4=;
	b=WIoJIys0PAw8pSZtF8oCB28LhVTBisu8/obIK62IYqcfuCEAB5vEfYX9ITG5JavcQa
	0tgLCeUkrkzmlEQc5ROvSXkd9qks/0lgk5F+If6AOcNGEHyZZ9UHVYw/3Tyfol5auFQf
	YWeQGAkLSIhlirxTT57fDq7Bl7DBkhjD06hH1EE/kdZRM2km5EjszCOVnXQi0x0B8csD
	yphtAIljRu4V4vImeZCzBk6VEoG59MOMxMgDmGGz2PfVGGb73HPjeeJkj3a4N1mPM8I2
	hha27MlyxbzvonBp4xpml5JZus0w/w6H3hBra8JErMnrdCk+997poge75KYrItQ0d+wc
	5yDg==
MIME-Version: 1.0
From: Terry Guo <terry.xpguo@gmail.com>
Date: Fri, 7 Sep 2018 15:06:22 +0800
Message-ID: 
 <CAATtE7D_q4qd4Y9uTP-JmfJZ_zGT01HYYtKZW0L3_Q+v3TCegA@mail.gmail.com>
Subject: [patch] Fix BZ 23606 -- Missing ENDBR32 in sysdeps/i386/start.S
To: libc-alpha@sourceware.org
Cc: hongjiu.lu@intel.com

Hello,

The patch is to fix this issue by wrapping the _start function with
ENTRY and END just like what we did for 64bit target. Tested with
glibc 32bit build, there is no regression. OK for trunk?

BR,
Terry


2018-09-07  H.J. Lu  <hongjiu.lu@intel.com>
            Xuepeng Guo  <xuepeng.guo@intel.com>

        [BZ #23606]
        * sysdeps/i386/start.S: Wrap _start function with ENTRY and END.

diff --git a/sysdeps/i386/start.S b/sysdeps/i386/start.S
index 91035fa83f..e35e9bd31b 100644
--- a/sysdeps/i386/start.S
+++ b/sysdeps/i386/start.S
@@ -52,10 +52,11 @@
                                        NULL
 */

-       .text
-       .globl _start
-       .type _start,@function
-_start:
+#include <sysdep.h>
+
+ENTRY (_start)
+       /* Clearing frame pointer is insufficient, use CFI.  */
+       cfi_undefined (eip)
        /* Clear the frame pointer.  The ABI suggests this be done, to mark
           the outermost frame obviously.  */
        xorl %ebp, %ebp
@@ -131,6 +132,7 @@ _start:
 1:     movl    (%esp), %ebx
        ret
 #endif
+END (_start)

 /* To fulfill the System V/i386 ABI we need this symbol.  Yuck, it's so
    meaningless since we don't support machines < 80386.  */