Skip to content

Commit 59c062d

Browse files
committed
Merge remote-tracking branch 'github/pull/320' into msimacek/GR-44958_github_prs
2 parents cd3336c + 3ce0557 commit 59c062d

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PosixConstants.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ public final class PosixConstants {
106106
public static final MandatoryIntConstant O_TRUNC;
107107
public static final MandatoryIntConstant O_APPEND;
108108
public static final MandatoryIntConstant O_NONBLOCK;
109+
public static final MandatoryIntConstant O_NOCTTY;
109110
public static final MandatoryIntConstant O_NDELAY;
110111
public static final MandatoryIntConstant O_DSYNC;
111112
public static final MandatoryIntConstant O_CLOEXEC;
@@ -359,6 +360,7 @@ public final class PosixConstants {
359360
O_TRUNC = reg.createMandatoryInt("O_TRUNC");
360361
O_APPEND = reg.createMandatoryInt("O_APPEND");
361362
O_NONBLOCK = reg.createMandatoryInt("O_NONBLOCK");
363+
O_NOCTTY = reg.createMandatoryInt("O_NOCTTY");
362364
O_NDELAY = reg.createMandatoryInt("O_NDELAY");
363365
O_DSYNC = reg.createMandatoryInt("O_DSYNC");
364366
O_CLOEXEC = reg.createMandatoryInt("O_CLOEXEC");
@@ -558,8 +560,8 @@ public final class PosixConstants {
558560
OFFSETOF_STRUCT_SOCKADDR_UN_SUN_PATH = reg.createMandatoryInt("OFFSETOF_STRUCT_SOCKADDR_UN_SUN_PATH");
559561
SIZEOF_STRUCT_SOCKADDR_UN_SUN_PATH = reg.createMandatoryInt("SIZEOF_STRUCT_SOCKADDR_UN_SUN_PATH");
560562

561-
openFlags = new IntConstant[]{O_ACCMODE, O_RDONLY, O_WRONLY, O_RDWR, O_CREAT, O_EXCL, O_TRUNC, O_APPEND, O_NONBLOCK, O_NDELAY, O_DSYNC, O_CLOEXEC, O_SYNC, O_DIRECT, O_RSYNC, O_TMPFILE,
562-
O_DIRECTORY};
563+
openFlags = new IntConstant[]{O_ACCMODE, O_RDONLY, O_WRONLY, O_RDWR, O_CREAT, O_EXCL, O_TRUNC, O_APPEND, O_NONBLOCK, O_NOCTTY, O_NDELAY, O_DSYNC, O_CLOEXEC, O_SYNC, O_DIRECT, O_RSYNC,
564+
O_TMPFILE, O_DIRECTORY};
563565
fileType = new IntConstant[]{S_IFMT, S_IFSOCK, S_IFLNK, S_IFREG, S_IFBLK, S_IFDIR, S_IFCHR, S_IFIFO};
564566
mmapFlags = new IntConstant[]{MAP_SHARED, MAP_PRIVATE, MAP_ANONYMOUS, MAP_DENYWRITE, MAP_EXECUTABLE};
565567
mmapProtection = new IntConstant[]{PROT_NONE, PROT_READ, PROT_WRITE, PROT_EXEC};

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PosixConstantsDarwin.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
*/
4141
package com.oracle.graal.python.runtime;
4242

43-
// Auto generated by gen_native_cfg.py at 2023-02-16 18:27:17.595009
44-
// on Darwin ol-mac-mini2-prague.cz.oracle.com 21.6.0 Darwin Kernel Version 21.6.0: Mon Dec 19 20:44:01 PST 2022; root:xnu-8020.240.18~2/RELEASE_X86_64 x86_64 i386
43+
// Auto generated by gen_native_cfg.py at 2023-03-16 07:20:43.880000
44+
// on Darwin some-user.local 21.6.0 Darwin Kernel Version 21.6.0: Mon Dec 19 20:44:01 PST 2022; root:xnu-8020.240.18~2/RELEASE_X86_64 x86_64 i386
4545
class PosixConstantsDarwin {
4646

4747
private PosixConstantsDarwin() {
@@ -77,6 +77,7 @@ static void getConstants(PosixConstants.Registry constants) {
7777
constants.put("O_TRUNC", 0x00000400);
7878
constants.put("O_APPEND", 0x00000008);
7979
constants.put("O_NONBLOCK", 0x00000004);
80+
constants.put("O_NOCTTY", 0x00020000);
8081
constants.put("O_NDELAY", 0x00000004);
8182
constants.put("O_DSYNC", 0x00400000);
8283
constants.put("O_CLOEXEC", 0x01000000);

scripts/gen_native_cfg.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@
151151
x O_TRUNC
152152
x O_APPEND
153153
0 x O_NONBLOCK
154+
0 x O_NOCTTY
154155
0 x O_NDELAY
155156
0 x O_DSYNC
156157
0 x O_CLOEXEC

0 commit comments

Comments
 (0)