From patchwork Thu May 1 16:30:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Ellcey X-Patchwork-Id: 344607 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 AF9C0140116 for ; Fri, 2 May 2014 02:31:12 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:subject:from:to:cc:date:in-reply-to :references:content-type:content-transfer-encoding:mime-version; q=dns; s=default; b=qL0OeqbZ3A1xwasb5n7Jlfc/qtLUVyu+sl1cokCW6cj Vmsp7u/1+NR0Nc34/aBX56mRAvsoClUGiQloWaDcxx8fJiP6/uu4T8PMAF+kIkWC zJVBGKp13ss9xKbJv1jfJSTZOILPcufq/kzm2byYkohweVkyrxXYvJbc0jHB4XL8 = DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:subject:from:to:cc:date:in-reply-to :references:content-type:content-transfer-encoding:mime-version; s=default; bh=cNRgS+WLlK8G7qZLT/Lk/ehxipY=; b=TCcc4qnASDacFwMIC pe/JKqY1BU+sj9aaf1nO/+jKzz/POER1nizWeJzzhdKZ8zamR4+oQnDrRaUiZKG3 /Ruci6fs4GfvKFACFKq49O9RmY9iEJjyKK7jttYs3rXFYeB0Hh01mZr/pZ+ROKQ0 5v5jeblRPErYt9mvvzQ4iIkKLk= Received: (qmail 4875 invoked by alias); 1 May 2014 16:31:06 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 4861 invoked by uid 89); 1 May 2014 16:31:05 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mailapp01.imgtec.com Message-ID: <1398961857.5201.29.camel@ubuntu-sellcey> Subject: Re: [Patch] Fix __mips16 undef macro warnings. From: Steve Ellcey To: Carlos O'Donell CC: "Joseph S. Myers" , , Date: Thu, 1 May 2014 09:30:57 -0700 In-Reply-To: <5360169F.30106@redhat.com> References: <535FF3AE.1070301@redhat.com> <535FF4E4.3030803@redhat.com> <5360169F.30106@redhat.com> MIME-Version: 1.0 I have checked in the __mips16 change to longlong.h into the GCC and binutils trees. Is it OK to check in this patch to bring the glibc header file into line with these two files. In addition to my change there is also a change Richard Sandiford made for x86. Steve Ellcey sellcey@mips.com 2014-05-01 Steve Ellcey * stdlib/longlong.h: Updated from GCC. diff --git a/stdlib/longlong.h b/stdlib/longlong.h index d45dbe2..31f88cb 100644 --- a/stdlib/longlong.h +++ b/stdlib/longlong.h @@ -483,7 +483,7 @@ extern UDItype __umulsidi3 (USItype, USItype); #define UDIV_TIME 40 #endif /* 80x86 */ -#if (defined (__x86_64__) || defined (__i386__)) && W_TYPE_SIZE == 64 +#if defined (__x86_64__) && W_TYPE_SIZE == 64 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ __asm__ ("add{q} {%5,%1|%1,%5}\n\tadc{q} {%3,%0|%0,%3}" \ : "=r" ((UDItype) (sh)), \ @@ -848,7 +848,7 @@ extern UDItype __umulsidi3 (USItype, USItype); #define UMUL_TIME 10 #define UDIV_TIME 100 -#if (__mips == 32 || __mips == 64) && ! __mips16 +#if (__mips == 32 || __mips == 64) && ! defined (__mips16) #define count_leading_zeros(COUNT,X) ((COUNT) = __builtin_clz (X)) #define COUNT_LEADING_ZEROS_0 32 #endif