JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: unbreak the build with GCC 7

Browse Source 
The recent port to GCC 8 used the 'nonstring' attribute, which is
unknown to GCC 7.  Define and use an 'ATTRIBUTE_NONSTRING' macro
instead.
This commit is contained in:
Ken Brown 2019-07-19 14:14:33 -04:00
parent 3a956a9bc3
commit 6b7723a830
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
winsup/cygwin/include/sys/utmp.h
View File

@ -19,16 +19,21 @@ extern "C" {
#define ut_name ut_user #define ut_name ut_user
#endif #endif
#if __GNUC__ >= 8
#define ATTRIBUTE_NONSTRING __attribute__ ((nonstring))
#else
#define ATTRIBUTE_NONSTRING
#endif
struct utmp struct utmp
{ {
short ut_type; short ut_type;
pid_t ut_pid; pid_t ut_pid;
char ut_line[UT_LINESIZE] __attribute__ ((nonstring)); char ut_line[UT_LINESIZE] ATTRIBUTE_NONSTRING;
char ut_id[UT_IDLEN]; char ut_id[UT_IDLEN];
time_t ut_time; time_t ut_time;
char ut_user[UT_NAMESIZE] __attribute__ ((nonstring)); char ut_user[UT_NAMESIZE] ATTRIBUTE_NONSTRING;
char ut_host[UT_HOSTSIZE] __attribute__ ((nonstring)); char ut_host[UT_HOSTSIZE] ATTRIBUTE_NONSTRING;
long ut_addr; long ut_addr;
}; };

8
winsup/cygwin/uname.cc
View File

@ -17,6 +17,12 @@ details. */
extern "C" int cygwin_gethostname (char *__name, size_t __len); extern "C" int cygwin_gethostname (char *__name, size_t __len);
extern "C" int getdomainname (char *__name, size_t __len); extern "C" int getdomainname (char *__name, size_t __len);
#if __GNUC__ >= 8
#define ATTRIBUTE_NONSTRING __attribute__ ((nonstring))
#else
#define ATTRIBUTE_NONSTRING
#endif
/* uname: POSIX 4.4.1.1 */ /* uname: POSIX 4.4.1.1 */
/* New entrypoint for applications since API 335 */ /* New entrypoint for applications since API 335 */
@ -25,7 +31,7 @@ uname_x (struct utsname *name)
{ {
__try __try
{ {
char buf[NI_MAXHOST + 1] __attribute__ ((nonstring)); char buf[NI_MAXHOST + 1] ATTRIBUTE_NONSTRING;
char *snp = strstr (cygwin_version.dll_build_date, "SNP"); char *snp = strstr (cygwin_version.dll_build_date, "SNP");
memset (name, 0, sizeof (*name)); memset (name, 0, sizeof (*name));