OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sim: ppc: fix compilation on AIX 7.1 due to st_pad name collisions 

AIX 7.1 defines st_pad[123] to st_[amc]tim.tv_pad, respectively,
breaking declaration of st_pad[123] members in struct solaris_stat.
Undefine them as this is no less terrible than other solutions (like
renaming the fields and losing the binding to Solaris' names).

From: Michael Haubenwallner <haubi@s01en24.gentoo.org>
This commit is contained in:
Mike Frysinger 2012-03-14 05:04:18 +00:00
parent ff1e452654
commit 51e40b125f
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sim/ppc/ChangeLog
View File

@ -1,3 +1,7 @@
2012-03-14 Michael Haubenwallner <michael.haubenwallner@salomon.at>
* emul_unix.c (st_pad1, st_pad2, st_pad3): Undefine.
2012-01-02 Joel Brobecker <brobecker@adacore.com>
* dp-bit.c: Reformat copyright header.

5
sim/ppc/emul_unix.c
View File

@ -1034,6 +1034,11 @@ typedef unsigned32 solaris_nlink_t;
#ifdef HAVE_SYS_STAT_H
#define SOLARIS_ST_FSTYPSZ 16 /* array size for file system type name */
/* AIX 7.1 defines st_pad[123] to st_[amc]tim.tv_pad, respectively */
#undef st_pad1
#undef st_pad2
#undef st_pad3
struct solaris_stat {
solaris_dev_t st_dev;
signed32 st_pad1[3]; /* reserved for network id */