* child_info.h (fork_info): Use different method to alias variable.

(spawn_info): Ditto.
* cxx.cc (__cxa_guard_acquire): New function (needed for gcc 4.x).
(__cxa_guard_release): Ditto.
* devices.in: Make sure stuff is correctly bracketed (for gcc 4.x).
* devices.cc: Regenerate.
* fhandler.h (fhandler_disk_file::fchmod): Avoid left coercion (for gcc 4.x).
* smallprint.c (__rn): Declare as __fastcall since gcc 4.x complains about use
of regparm, for some reason.
* sync.h (sync::init_lock): Remove.
* sync.cc (sync::init_lock): Ditto.

1 files changed, 42 insertions, 40 deletions

diff --git a/winsup/cygwin/devices.in b/winsup/cygwin/devices.in
index 05c551655..b43232510 100644
--- a/winsup/cygwin/devices.in
+++ b/winsup/cygwin/devices.in
@@ -13,72 +13,74 @@ typedef const device *KR_device_t;
 %type KR_device_t
 %local {
 const device dev_cygdrive_storage =
-  {"/cygdrive", FH_CYGDRIVE, "/cygdrive"};
+  {"/cygdrive", {FH_CYGDRIVE}, "/cygdrive"};
 
 const device dev_fs_storage =
-  {"", FH_FS, ""};
+  {"", {FH_FS}, ""};
 
 const device dev_proc_storage =
-  {"", FH_PROC, ""};
+  {"", {FH_PROC}, ""};
 
 const device dev_registry_storage =
-  {"", FH_REGISTRY, ""};
+  {"", {FH_REGISTRY}, ""};
 
 const device dev_piper_storage =
-  {"", FH_PIPER, ""};
+  {"", {FH_PIPER}, ""};
 
 const device dev_pipew_storage =
-  {"", FH_PIPEW, ""};
+  {"", {FH_PIPEW}, ""};
 
 const device dev_tcp_storage =
-  {"", FH_TCP, ""};
+  {"", {FH_TCP}, ""};
 
 const device dev_udp_storage =
-  {"", FH_UDP, ""};
+  {"", {FH_UDP}, ""};
 
 const device dev_stream_storage =
-  {"", FH_STREAM, ""};
+  {"", {FH_STREAM}, ""};
 
 const device dev_dgram_storage =
-  {"", FH_DGRAM, ""};
+  {"", {FH_DGRAM}, ""};
 
 const device dev_bad_storage =
-  {"", FH_BAD, ""};
+  {"", {FH_BAD}, ""};
+#define BRACK(x) {x}
 
 %storage_here
 }
 %%
-"/dev/tty", FH_TTY, "\\dev\\tty"
-"/dev/tty%(0-63)d", FHDEV(DEV_TTYS_MAJOR, {$1}), "\\dev\\tty{$1}", ttys_dev
-"/dev/console", FH_CONSOLE, "\\dev\\console", console_dev
-"/dev/ttym", FH_TTYM, "\\dev\\ttym", ttym_dev
-"/dev/ptmx", FH_PTYM, "\\dev\\ptmx"
-"/dev/windows", FH_WINDOWS, "\\dev\\windows"
-"/dev/dsp", FH_OSS_DSP, "\\dev\\dsp"
-"/dev/conin", FH_CONIN, "conin"
-"/dev/conout", FH_CONOUT, "conout"
-"/dev/null", FH_NULL, "nul"
-"/dev/zero", FH_ZERO, "\\dev\\zero"
-"/dev/full", FH_FULL, "\\dev\\full"
-"/dev/random", FH_RANDOM, "\\dev\\random"
-"/dev/urandom", FH_URANDOM, "\\dev\\urandom", urandom_dev
-"/dev/mem", FH_MEM, "\\dev\\mem"
-"/dev/kmem", FH_KMEM, "\\dev\\mem"
-"/dev/clipboard", FH_CLIPBOARD, "\\dev\\clipboard"
-"/dev/port", FH_PORT, "\\dev\\port"
-"/dev/com%(1-16)d", FHDEV(DEV_SERIAL_MAJOR, {$1}), "\\\\.\\com{$1}"
-"/dev/ttyS%(0-15)d", FHDEV(DEV_SERIAL_MAJOR, {$1 + 1}), "\\\\.\\com{$1 + 1}"
-"/dev/pipe", FH_PIPE, "\\dev\\pipe"
-"/dev/fifo", FH_FIFO, "\\dev\\fifo"
-"/dev/st%(0-127)d", FHDEV(DEV_TAPE_MAJOR, {$1}), "\\Device\\Tape{$1}"
-"/dev/nst%(0-127)d", FHDEV(DEV_TAPE_MAJOR, {$1 + 128}), "\\Device\\Tape{$1}"
-"/dev/fd%(0-15)d", FHDEV(DEV_FLOPPY_MAJOR, {$1}), "\\Device\\Floppy{$1}"
-"/dev/scd%(0-15)d", FHDEV(DEV_CDROM_MAJOR, {$1}), "\\Device\\CdRom{$1}"
-"/dev/sr%(0-15)d", FHDEV(DEV_CDROM_MAJOR, {$1}), "\\Device\\CdRom{$1}"
-"/dev/sd%{a-z}s", FH_SD{uc $1}, "\\Device\\Harddisk{ord($1) - ord('a')}\\Partition0"
-"/dev/sd%{a-z}s%(1-15)d", FH_SD{uc $1} | {$2}, "\\Device\\Harddisk{ord($1) - ord('a')}\\Partition{$2 % 16}"
+"/dev/tty", BRACK(FH_TTY), "\\dev\\tty"
+"/dev/tty%(0-63)d", BRACK(FHDEV(DEV_TTYS_MAJOR, {$1})), "\\dev\\tty{$1}", ttys_dev
+"/dev/console", BRACK(FH_CONSOLE), "\\dev\\console", console_dev
+"/dev/ttym", BRACK(FH_TTYM), "\\dev\\ttym", ttym_dev
+"/dev/ptmx", BRACK(FH_PTYM), "\\dev\\ptmx"
+"/dev/windows", BRACK(FH_WINDOWS), "\\dev\\windows"
+"/dev/dsp", BRACK(FH_OSS_DSP), "\\dev\\dsp"
+"/dev/conin", BRACK(FH_CONIN), "conin"
+"/dev/conout", BRACK(FH_CONOUT), "conout"
+"/dev/null", BRACK(FH_NULL), "nul"
+"/dev/zero", BRACK(FH_ZERO), "\\dev\\zero"
+"/dev/full", BRACK(FH_FULL), "\\dev\\full"
+"/dev/random", BRACK(FH_RANDOM), "\\dev\\random"
+"/dev/urandom", BRACK(FH_URANDOM), "\\dev\\urandom", urandom_dev
+"/dev/mem", BRACK(FH_MEM), "\\dev\\mem"
+"/dev/kmem", BRACK(FH_KMEM), "\\dev\\mem"
+"/dev/clipboard", BRACK(FH_CLIPBOARD), "\\dev\\clipboard"
+"/dev/port", BRACK(FH_PORT), "\\dev\\port"
+"/dev/com%(1-16)d", BRACK(FHDEV(DEV_SERIAL_MAJOR, {$1})), "\\\\.\\com{$1}"
+"/dev/ttyS%(0-15)d", BRACK(FHDEV(DEV_SERIAL_MAJOR, {$1 + 1})), "\\\\.\\com{$1 + 1}"
+"/dev/pipe", BRACK(FH_PIPE), "\\dev\\pipe"
+"/dev/fifo", BRACK(FH_FIFO), "\\dev\\fifo"
+"/dev/st%(0-127)d", BRACK(FHDEV(DEV_TAPE_MAJOR, {$1})), "\\Device\\Tape{$1}"
+"/dev/nst%(0-127)d", BRACK(FHDEV(DEV_TAPE_MAJOR, {$1 + 128})), "\\Device\\Tape{$1}"
+"/dev/fd%(0-15)d", BRACK(FHDEV(DEV_FLOPPY_MAJOR, {$1})), "\\Device\\Floppy{$1}"
+"/dev/scd%(0-15)d", BRACK(FHDEV(DEV_CDROM_MAJOR, {$1})), "\\Device\\CdRom{$1}"
+"/dev/sr%(0-15)d", BRACK(FHDEV(DEV_CDROM_MAJOR, {$1})), "\\Device\\CdRom{$1}"
+"/dev/sd%{a-z}s", BRACK(FH_SD{uc $1}), "\\Device\\Harddisk{ord($1) - ord('a')}\\Partition0"
+"/dev/sd%{a-z}s%(1-15)d", BRACK(FH_SD{uc $1} | {$2}), "\\Device\\Harddisk{ord($1) - ord('a')}\\Partition{$2 % 16}"
 %other	{return	NULL;}
 %%
+#undef BRACK
 void
 device::parse (const char *s)
 {