From patchwork Mon Apr 1 09:05:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 161522 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp197630jan; Mon, 1 Apr 2019 02:05:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqzEIYUE10xqTIFGkfU8VqEy+EewjvhwjPVpD/psvQcI1+TlgCm+kyb+yjPOe6tDHDORIPed X-Received: by 2002:a63:fb16:: with SMTP id o22mr58238753pgh.209.1554109527371; Mon, 01 Apr 2019 02:05:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554109527; cv=none; d=google.com; s=arc-20160816; b=dB9DAsogxE/QQmGMyXhabYkC2EW08PwMh9xn1lC0kYkSDAUzYQSg8YbkcxT4PDmozV ImXsrEfspUbhOhbE/ZyL9R1SUfhehlvpUCpt1XuIPPc0igxMzDXqk7ZBruZA5jcAIY5i uBGqwdEqiZ4aZJqq5aKjdBtWoHpZ8q3JHhPTVg1H6nrc7ErTQMsOj/oGTGJ+G9LidpBs oqd6P78D4xuY6X7uNT0tEOM6sBuL9j7gozTb6FVOjU9/ga54d/OVRuNX5fmljC8yqQdz FpOyuwzP5L1mvPS5d5Mf68T7adjVHKty+PIG/M9VxMUGDyUFCkFhQXKen/Gymh8qJ7FP Ddxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature:delivered-to :sender:list-help:list-post:list-archive:list-subscribe :list-unsubscribe:list-id:precedence:mailing-list:dkim-signature :domainkey-signature; bh=85XMocBctvB6GY1ZS359qaBqwg5Nx23mhQcQv51dfKQ=; b=Pdvn64lp9oJ40fj0Uli0HUqeWUoJ4pZXJCjQsRjTs9D0PNMsgHWkusLmFA0Ihcqp7J uUrEOQFd988NXChSUkJs01SNasUGdxiXUpkYfpGMl98oYcvBez0pRxuS/zqqfxtZVp48 DIOpaKBDtdfNS7x8FFnksu3tA6VstAC6gcd2ISgTNdWGoRzmK4IT1d8S8dq2fDoXeUhh 3zeoeOJ0fJGwz7YyCpyEL1+PYkBDoMcY1Rwe2tNVmVtlycdpBrFkNQlnsrl91XGY4cjL rachZZriqgGgHHH7EuNwHtLgijLYndsVnMfAxctf6wzoJPe7Qpjbj+cUYHgG2GJHsb4i ZZ9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=kQlswU5R; dkim=pass header.i=@linaro.org header.s=google header.b=aa8OFH+j; spf=pass (google.com: domain of libc-alpha-return-101073-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-101073-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id y10si8340644plt.287.2019.04.01.02.05.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 02:05:27 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-101073-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=kQlswU5R; dkim=pass header.i=@linaro.org header.s=google header.b=aa8OFH+j; spf=pass (google.com: domain of libc-alpha-return-101073-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-101073-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; q=dns; s= default; b=XvFl78l9m6RQxEz18N52nmi7DlSnCzHY2ktuKL88e2M9xM0dSu9EW ehW3lBWsIrzZWHQT+vpugAQE1OTA3MftwrJdVRYK7zrJFbYuN3nhcRRZgwAwsNHo p/FXcdIDQSK83Ci/oUCwx94kHuzg/e+tnFieOqKxXhK9iMeYUWJXsU= 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:from:to:cc:subject:date:message-id; s=default; bh=4X7xTJ4l8PsSxvjFEY2LPE4JpEQ=; b=kQlswU5R3VUwOnyaKcgpS2UVJ8dD vzb1h87IRjzdhtP3w031A1l3SE6IjaNP9rhMXC0kEvwSInRUeCAD8lN8ULW2t4ZX QU1t7qxawG3xX0wNOaaN8jdLW7w4Oxf8jZf2GpDpaPcSDps4aGl9x8pP0VhZGlFg SAoh67IamHSs2lU= Received: (qmail 93759 invoked by alias); 1 Apr 2019 09:05:18 -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 93745 invoked by uid 89); 1 Apr 2019 09:05:18 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=HX-Envelope-From:sk:richard, HX-Spam-Relays-External:209.85.215.194, H*RU:209.85.215.194, H*r:sk:mail-pg X-HELO: mail-pg1-f194.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=85XMocBctvB6GY1ZS359qaBqwg5Nx23mhQcQv51dfKQ=; b=aa8OFH+jw2n233t2zr6iZzs8m/DyyzGF1nZ6qIHtBDg0PHBOFw08E8D57gs9HqIPAp vEVvZgqXGnXZcL98zAeppT+gweHx8jvUltPlrVCxy/rMxTOQGX9pll9gIh1ZyuQPzGsL z1RJWFSoMLa4pacrO8aGsLfPsvILoCqOU4umiOH0eeJ5Nta5JwFwvyJMtAGWCmSvXdub fMQGvdZ2bWaCnGhyxBC/LxMt5WgbafPSi8uVgwCrFwNRJ8C4IRJl89ijwe9VaGLIZrde /ET1jXCQagLDqr2UgZR/sEew1q7bYIQqZaIcXKJ3Spcptl2Wnc6UDJmnkRsiUhNtAFJH O/Yw== Return-Path: From: Richard Henderson To: libc-alpha@sourceware.org Cc: Richard Henderson Subject: [PATCH] alpha: Do not redefine __NR_shmat or __NR_osf_shmat Date: Mon, 1 Apr 2019 16:05:10 +0700 Message-Id: <20190401090510.10243-1-rth@twiddle.net> From: Richard Henderson Fixes build using v5.1-rc1 headers. The kernel has cleaned up how these are defined. Previous behavior was to define __NR_osf_shmat as 209 and not define __NR_shmat. Current behavior is to define __NR_shmat as 209 and then define __NR_osf_shmat as __NR_shmat. Committed. r~ * sysdeps/unix/sysv/linux/alpha/kernel-features.h (__NR_shmat): Do not redefine. * sysdeps/unix/sysv/linux/alpha/sysdep.h (__NR_osf_shmat): Do not redefine. --- sysdeps/unix/sysv/linux/alpha/kernel-features.h | 6 ++++-- sysdeps/unix/sysv/linux/alpha/sysdep.h | 4 +++- ChangeLog | 7 +++++++ 3 files changed, 14 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/sysdeps/unix/sysv/linux/alpha/kernel-features.h b/sysdeps/unix/sysv/linux/alpha/kernel-features.h index 0b0a94af2c..f3298b234e 100644 --- a/sysdeps/unix/sysv/linux/alpha/kernel-features.h +++ b/sysdeps/unix/sysv/linux/alpha/kernel-features.h @@ -26,8 +26,10 @@ #undef __ASSUME_STATFS64 #define __ASSUME_STATFS64 0 -/* Alpha defines SysV ipc shmat syscall with a different name. */ -#define __NR_shmat __NR_osf_shmat +/* Alpha used to define SysV ipc shmat syscall with a different name. */ +#ifndef __NR_shmat +# define __NR_shmat __NR_osf_shmat +#endif #define __ASSUME_RECV_SYSCALL 1 #define __ASSUME_SEND_SYSCALL 1 diff --git a/sysdeps/unix/sysv/linux/alpha/sysdep.h b/sysdeps/unix/sysv/linux/alpha/sysdep.h index dcf2d1e3d7..d61d4df550 100644 --- a/sysdeps/unix/sysv/linux/alpha/sysdep.h +++ b/sysdeps/unix/sysv/linux/alpha/sysdep.h @@ -51,7 +51,9 @@ * Some syscalls no Linux program should know about: */ #define __NR_osf_sigprocmask 48 -#define __NR_osf_shmat 209 +#ifndef __NR_osf_shmat +# define __NR_osf_shmat 209 +#endif #define __NR_osf_getsysinfo 256 #define __NR_osf_setsysinfo 257 diff --git a/ChangeLog b/ChangeLog index bef50d40f6..54b90015ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2019-04-01 Richard Henderson + + * sysdeps/unix/sysv/linux/alpha/kernel-features.h (__NR_shmat): + Do not redefine. + * sysdeps/unix/sysv/linux/alpha/sysdep.h (__NR_osf_shmat): + Do not redefine. + 2019-03-30 Maciej W. Rozycki * sysdeps/unix/sysv/linux/riscv/configure.ac: Quote