From 39b06c208fb7b7edb98866252cbd05ba0918f666 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Tue, 26 Sep 2017 14:58:53 +0200 Subject: [PATCH] Fix gdb 8.1 Solaris/SPARC compilation (PR build/22206) When testing my Solaris < 10 removal patch on Solaris/SPARC, I found that gdb mainline is currently broken there due to the recent SPARC M7 ADI patches: /vol/src/gnu/gdb/gdb/local/gdb/sparc64-tdep.c:1876:0: error: "PSR_ICC" redefined [-Werror] #define PSR_ICC 0x00f00000 ^ In file included from /usr/include/v7/sys/privregs.h:24:0, from /usr/include/sys/regset.h:420, from /usr/include/sys/ucontext.h:21, from /usr/include/sys/signal.h:231, from /usr/include/sys/procset.h:23, from /usr/include/sys/wait.h:25, from /usr/include/stdlib.h:21, from build-gnulib/import/stdlib.h:36, from /vol/src/gnu/gdb/gdb/local/gdb/common/common-defs.h:53, from /vol/src/gnu/gdb/gdb/local/gdb/defs.h:28, from /vol/src/gnu/gdb/gdb/local/gdb/sparc64-tdep.c:20: /usr/include/v7/sys/psr.h:35:0: note: this is the location of the previous definition #define PSR_ICC 0x00F00000 /* integer condition codes */ ^ /vol/src/gnu/gdb/gdb/local/gdb/sparc64-tdep.c:1878:0: error: "PSR_IMPL" redefined [-Werror] #define PSR_IMPL 0xf0000000 ^ In file included from /usr/include/v7/sys/privregs.h:24:0, from /usr/include/sys/regset.h:420, from /usr/include/sys/ucontext.h:21, from /usr/include/sys/signal.h:231, from /usr/include/sys/procset.h:23, from /usr/include/sys/wait.h:25, from /usr/include/stdlib.h:21, from build-gnulib/import/stdlib.h:36, from /vol/src/gnu/gdb/gdb/local/gdb/common/common-defs.h:53, from /vol/src/gnu/gdb/gdb/local/gdb/defs.h:28, from /vol/src/gnu/gdb/gdb/local/gdb/sparc64-tdep.c:20: /usr/include/v7/sys/psr.h:41:0: note: this is the location of the previous definition #define PSR_IMPL 0xF0000000 /* implementation */ ^ Comparing Solaris 11.4 and sparc64-tdep.c, there are more inconsistencies: : #define PSR_S 0x00000080 /* supervisor mode */ #define PSR_ICC 0x00F00000 /* integer condition codes */ #define PSR_VER 0x0F000000 /* mask version */ #define PSR_IMPL 0xF0000000 /* implementation */ #define PSR_RSV 0x000FC000 /* reserved */ sparc64-tdep.c: #define PSR_S 0x00000080 #define PSR_ICC 0x00f00000 #define PSR_VERS 0x0f000000 #define PSR_IMPL 0xf0000000 #define PSR_V8PLUS 0xff000000 #define PSR_XCC 0x000f0000 Apart from the capitalization differences that trip g++, the names differ (PSR_VER vs. PSR_VERS), PSR_XCC is included in Solaris' PSR_RSV, and there's no PSR_V8PLUS on Solaris either. /vol/src/gnu/gdb/gdb/local/gdb/sparc64-tdep.c: In function `int adi_tag_fd()': /vol/src/gnu/gdb/gdb/local/gdb/sparc64-tdep.c:296:63: error: format `%d' expects argument of type `int', but argument 4 has type `pid_t {aka long int}' [-Werror=format=] snprintf (cl_name, sizeof(cl_name), "/proc/%d/adi/tags", pid); ^ /vol/src/gnu/gdb/gdb/local/gdb/sparc64-tdep.c: In function `bool adi_is_addr_mapped(CORE_ADDR, std::size_t)': /vol/src/gnu/gdb/gdb/local/gdb/sparc64-tdep.c:314:64: error: format `%d' expects argument of type `int', but argument 4 has type `pid_t {aka long int}' [-Werror=format=] snprintf (filename, sizeof filename, "/proc/%d/adi/maps", pid); ^ You cannot always print a pid_t, which can be either int or long on Solaris, as an int. Obviously, the ADI patch which modifies code shared between all SPARC targets, hasn't been tested on anything but Linux/SPARC. The patch below includes the minimal fixes necessary to unbreak the Solaris/SPARC build. However, as detailed in the PR, there's more breakage here: apart from not bothering to implement ADI support on Solaris, the code contains several more changes to shared/common SPARC code that are simply wrong on anything but Linux/SPARC. The patch was tested on sparcv9-sun-solaris2.10 and sparcv9-sun-solaris2.11.4 (build and gdb/gdb gdb/gdb smoke test only). PR build/22206 * sparc64-tdep.c (adi_tag_fd): Print pid as long. (adi_is_addr_mapped): Likewise. (PSR_ICC): Don't redefine. (PSR_IMPL): Likewise. --- gdb/ChangeLog | 8 ++++++++ gdb/sparc64-tdep.c | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0b9aea224d0..89c960a32d8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2017-09-26 Rainer Orth + + PR build/22206 + * sparc64-tdep.c (adi_tag_fd): Print pid as long. + (adi_is_addr_mapped): Likewise. + (PSR_ICC): Don't redefine. + (PSR_IMPL): Likewise. + 2017-09-25 Tom Tromey * regcache.c (regcache::dump): Use string_printf. diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c index bd7f45f773d..a5ca434c289 100644 --- a/gdb/sparc64-tdep.c +++ b/gdb/sparc64-tdep.c @@ -293,7 +293,7 @@ adi_tag_fd (void) return proc->stat.tag_fd; char cl_name[MAX_PROC_NAME_SIZE]; - snprintf (cl_name, sizeof(cl_name), "/proc/%d/adi/tags", pid); + snprintf (cl_name, sizeof(cl_name), "/proc/%ld/adi/tags", (long) pid); int target_errno; proc->stat.tag_fd = target_fileio_open (NULL, cl_name, O_RDWR|O_EXCL, 0, &target_errno); @@ -311,7 +311,7 @@ adi_is_addr_mapped (CORE_ADDR vaddr, size_t cnt) size_t i = 0; pid_t pid = ptid_get_pid (inferior_ptid); - snprintf (filename, sizeof filename, "/proc/%d/adi/maps", pid); + snprintf (filename, sizeof filename, "/proc/%ld/adi/maps", (long) pid); char *data = target_fileio_read_stralloc (NULL, filename); if (data) { @@ -1873,9 +1873,13 @@ sparc64_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) #define TSTATE_XCC 0x000000f000000000ULL #define PSR_S 0x00000080 +#ifndef PSR_ICC #define PSR_ICC 0x00f00000 +#endif #define PSR_VERS 0x0f000000 +#ifndef PSR_IMPL #define PSR_IMPL 0xf0000000 +#endif #define PSR_V8PLUS 0xff000000 #define PSR_XCC 0x000f0000 -- 2.30.2