From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8509 invoked by alias); 17 Jul 2017 15:45:00 -0000 Mailing-List: contact elfutils-devel-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Post: List-Help: List-Subscribe: Sender: elfutils-devel-owner@sourceware.org Received: (qmail 8494 invoked by uid 89); 17 Jul 2017 15:44:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-23.1 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY,UNWANTED_LANGUAGE_BODY autolearn=ham version=3.3.2 spammy=Hx-languages-length:1234 X-Spam-Status: No, score=-23.1 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY,UNWANTED_LANGUAGE_BODY autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: gnu.wildebeest.org Received: from wildebeest.demon.nl (HELO gnu.wildebeest.org) (212.238.236.112) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 17 Jul 2017 15:44:58 +0000 Received: from tarox.wildebeest.org (tarox.wildebeest.org [172.31.17.39]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 726EB302729F; Mon, 17 Jul 2017 17:44:56 +0200 (CEST) Received: by tarox.wildebeest.org (Postfix, from userid 1000) id 5E7D540E39E1; Mon, 17 Jul 2017 17:44:56 +0200 (CEST) From: Mark Wielaard To: elfutils-devel@sourceware.org Cc: Mark Wielaard Subject: [COMMITTED] backends: Swap sys/ptrace.h and asm/ptrace.h include order on s390. Date: Mon, 17 Jul 2017 15:45:00 -0000 Message-Id: <1500306294-12809-1-git-send-email-mark@klomp.org> X-Mailer: git-send-email 1.8.3.1 X-IsSubscribed: yes X-SW-Source: 2017-q3/txt/msg00018.txt.bz2 glibc 2.26 changed the sys/ptrace.h header so that it cannot be included after asm/ptrace.h. We still need to include the kernel asm/ptrace.h for the ptrace_area definition. Including it after sys/ptrace.h works against both old and new glibc. Signed-off-by: Mark Wielaard --- backends/ChangeLog | 4 ++++ backends/s390_initreg.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/backends/ChangeLog b/backends/ChangeLog index c5f61e8..d628245 100644 --- a/backends/ChangeLog +++ b/backends/ChangeLog @@ -1,3 +1,7 @@ +2017-06-17 Mark Wielaard + + * s390_initreg.c: Swap sys/ptrace.h and asm/ptrace.h include order. + 2017-06-15 Andreas Schwab * ppc_symbol.c (ppc_machine_flag_check): New function. diff --git a/backends/s390_initreg.c b/backends/s390_initreg.c index 011305c..23bf8ed 100644 --- a/backends/s390_initreg.c +++ b/backends/s390_initreg.c @@ -34,8 +34,8 @@ #include #if defined(__s390__) && defined(__linux__) # include -# include # include +# include #endif #define BACKEND s390_ -- 1.8.3.1