From patchwork Mon Nov 21 17:38:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zack Weinberg X-Patchwork-Id: 17673 Received: (qmail 59803 invoked by alias); 21 Nov 2016 17:39:13 -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 59785 invoked by uid 89); 21 Nov 2016 17:39:12 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=libm, observed X-HELO: mail-qk0-f196.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:cc:from:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=q4wH6iFbrczLhhjtyoTnsRAMkgLKWy7is0WMHVq/uvw=; b=JffeDrJQ3Ve4QP/ASmSP7YTVCd41PpPGt8BmXHs0C4GdtzM13/70Wjw21T8qt3LbZd mB2ToWR+49PzjNzlw7iWQtGwBG68tYADXWf0tAvheUpafq2blqbqtgR83su66FtQVBMA 1kmsB7XHEx8M2S7nscV4mNglknxRr5ddb3BJxIVUhtE11w0SyryKS2mzxITigMVSHGQp 8w4PyJi4mhZZv6r4yIRlRQ3Lj6ntDvo1WFhMmAiu7wNd8FPnEc2v4KHOT61syx2nwvNl N9/XuZ+WD0/0SzoOQFLkRtpDGZKjlJhL40bnxvEP2cCEa4cP+nT5cDZ7F5mONNMLd3bU 7DVQ== X-Gm-Message-State: AKaTC01EQeGs/CnujVi3U1b6l4+n92d31ZZ0nqYGGrz2HtTv2p4dSqc8Pyry82cM2jr6mA== X-Received: by 10.55.88.197 with SMTP id m188mr15979179qkb.322.1479749941083; Mon, 21 Nov 2016 09:39:01 -0800 (PST) Subject: [PATCH] [ia64] Make all of sysdeps/ia64/fpu/libm-symbols.h only visible to libc||libm To: GNU C Library Cc: vapier@gentoo.org From: Zack Weinberg X-Forwarded-Message-Id: Message-ID: <3d50ecc9-2c08-6bf9-53c8-1e66bbe5aab1@panix.com> Date: Mon, 21 Nov 2016 12:38:59 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 When experimenting with Joseph's build-many-glibcs.py I found that sysdeps/ia64/fpu/libm-symbols.h and the -D switches added to the command line by sysdeps/ia64/fpu/Makefile can break the math tests. This patch moves the -D switches into libm-symbols.h and makes that file only apply when IS_IN(libc)||IS_IN(libm), which is sufficient to clear the test failure I observed. Tested (cross compile only) on ia64-linux-gnu. OK? zw --- sysdeps/ia64/fpu/Makefile | 6 +----- sysdeps/ia64/fpu/libm-symbols.h | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) #if defined ASSEMBLER && IS_IN (libc) # define __libm_error_support HIDDEN_JUMPTARGET(__libm_error_support) #endif + +#endif diff --git a/sysdeps/ia64/fpu/Makefile b/sysdeps/ia64/fpu/Makefile index 384fc83..450d712 100644 --- a/sysdeps/ia64/fpu/Makefile +++ b/sysdeps/ia64/fpu/Makefile @@ -26,9 +26,5 @@ libm-sysdep_routines += s_erfc s_erfcf s_erfcl \ sysdep_routines += libc_libm_error libm_frexp libm_frexpf libm_frexpl \ $(duplicated-routines) -sysdep-CPPFLAGS += -include libm-symbols.h \ - -D__POSIX__ -Dopensource \ - -D_LIB_VERSIONIMF=_LIB_VERSION \ - -DSIZE_INT_32 -DSIZE_LONG_INT_64 -DSIZE_LONG_LONG_INT_64 \ - -DSIZE_LONG_64 -DIA64 +sysdep-CPPFLAGS += -include libm-symbols.h endif diff --git a/sysdeps/ia64/fpu/libm-symbols.h b/sysdeps/ia64/fpu/libm-symbols.h index 3cbc6c4..62c9adb 100644 --- a/sysdeps/ia64/fpu/libm-symbols.h +++ b/sysdeps/ia64/fpu/libm-symbols.h @@ -1,3 +1,16 @@ +#if IS_IN (libc) || IS_IN (libm) + +/* The externally maintained code in this directory expects these + macros to be defined. */ +#define __POSIX__ 1 +#define opensource 1 +#define _LIB_VERSIONIMF _LIB_VERSION +#define SIZE_INT_32 1 +#define SIZE_LONG_INT_64 1 +#define SIZE_LONG_LONG_INT_64 1 +#define SIZE_LONG_64 1 +#define IA64 1 + #include #undef ret /* get rid of the stupid "ret" macro; it breaks br.ret */ @@ -56,3 +69,5 @@