From patchwork Thu Jul 30 03:12:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 7928 X-Patchwork-Delegate: vapier@gentoo.org Received: (qmail 96929 invoked by alias); 30 Jul 2015 03:12:30 -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 96893 invoked by uid 89); 30 Jul 2015 03:12:29 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_05, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: smtp.gentoo.org From: Mike Frysinger To: libc-alpha@sourceware.org Subject: [PATCH/committed] hppa: fix sysdep.h header setup Date: Wed, 29 Jul 2015 23:12:27 -0400 Message-Id: <1438225947-30343-1-git-send-email-vapier@gentoo.org> The semi-recent SYSCALL_CANCEL inclusion broke hppa due to the sysdep.h headers not including the unix/sysdep.h headers. Rework the includes so we match the other ports: * hppa/sysdep.h: - Do not include sys/syscall.h as the unix sysdep.h headers do it. - Do not include config.h as libc-symbols.h does it, and it has no #ifdef multiple-include protection, and it breaks when some files do things like #undef __OPTIMIZE__. * sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h: - Drop the generic/sysdep.h as the unix sysdep.h headers include it. * sysdeps/unix/sysv/linux/hppa/sysdep.h: - Change to the unix & core hppa sysdep header stacks. - Undef a few defines that the core headers already set up for us. --- sysdeps/hppa/sysdep.h | 2 -- sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h | 1 - sysdeps/unix/sysv/linux/hppa/sysdep.h | 11 +++++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sysdeps/hppa/sysdep.h b/sysdeps/hppa/sysdep.h index 03fb2a4..366b830 100644 --- a/sysdeps/hppa/sysdep.h +++ b/sysdeps/hppa/sysdep.h @@ -18,8 +18,6 @@ . */ #include -#include -#include "config.h" #undef ASM_LINE_SEP #define ASM_LINE_SEP ! diff --git a/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h b/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h index 5580e94..277b721 100644 --- a/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h @@ -16,7 +16,6 @@ . */ #include -#include #include #ifndef __ASSEMBLER__ # include diff --git a/sysdeps/unix/sysv/linux/hppa/sysdep.h b/sysdeps/unix/sysv/linux/hppa/sysdep.h index 17c8738..d20a04b 100644 --- a/sysdeps/unix/sysv/linux/hppa/sysdep.h +++ b/sysdeps/unix/sysv/linux/hppa/sysdep.h @@ -18,8 +18,11 @@ License along with the GNU C Library. If not, see . */ -#include -#include +#ifndef _LINUX_HPPA_SYSDEP_H +#define _LINUX_HPPA_SYSDEP_H 1 + +#include +#include /* Defines RTLD_PRIVATE_ERRNO. */ #include @@ -118,6 +121,7 @@ There is currently a bug in gdb which prevents us from specifying incomplete stabs information. Fake some entries here which specify the current source file. */ +#undef ENTRY #define ENTRY(name) \ .text ASM_LINE_SEP \ .align ALIGNARG(4) ASM_LINE_SEP \ @@ -174,6 +178,7 @@ bv,n 0(2) */ +#undef PSEUDO #define PSEUDO(name, syscall_name, args) \ ENTRY (name) ASM_LINE_SEP \ /* If necc. load args from stack */ ASM_LINE_SEP \ @@ -483,3 +488,5 @@ L(pre_end): ASM_LINE_SEP \ /* Pointer mangling is not yet supported for HPPA. */ #define PTR_MANGLE(var) (void) (var) #define PTR_DEMANGLE(var) (void) (var) + +#endif /* _LINUX_HPPA_SYSDEP_H */