diff options
-rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
-rw-r--r-- | libgo/sysinfo.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index dc63f4a..df9d211 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -b75a139fcc7c56988ce2d5b3a2b9e274eb521b0d +a47485cd0e9ce6a8b3e88e53ccc0a440f0bd4351 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c index 0692fd4..7640559 100644 --- a/libgo/sysinfo.c +++ b/libgo/sysinfo.c @@ -316,6 +316,7 @@ enum { SREF(dirent); SREF(dirent64); OTREF(DIR); +EREF(DT_UNKNOWN); // From fcntl.h SREF(flock); @@ -437,6 +438,7 @@ SREF(rusage); SREF(rlimit64); EREF(RLIMIT_NOFILE); EREF(PRIO_USER); +EREF(RUSAGE_SELF); // From sys/select.h TREF(fd_set); |