d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/build: Don't redefine open() for the linux bootstrap

Browse Source 
This is needed to bootstrap llvm-tblgen on Linux since LLVM calls
`::open(...)` which does not work if open is a statement macro.
Also stop defining O_SHLOCK/O_EXLOCK and update the only bootstrap tools
user of those flags to deal with missing definitions.

Reviewed By:	jrtc27
MFC after:	1 week
Differential Revision: https://reviews.freebsd.org/D31226
This commit is contained in:
Alex Richardson 2021-08-02 09:45:05 +01:00
parent 1b1bb6f178
commit 5f6c8ce245
2 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libc/db/db/db.c
View File

@ -49,6 +49,12 @@ static int __dberr(void);
#ifndef O_CLOEXEC
#define O_CLOEXEC 0
#endif
#ifndef O_EXLOCK
#define O_EXLOCK 0
#endif
#ifndef O_SHLOCK
#define O_SHLOCK 0
#endif
DB *
dbopen(const char *fname, int flags, int mode, DBTYPE type, const void *openinfo)

25
tools/build/cross-build/include/linux/fcntl.h
View File

@ -1,7 +1,7 @@
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2018-2020 Alex Richardson <arichardson@FreeBSD.org>
* Copyright 2018-2021 Alex Richardson <arichardson@FreeBSD.org>
*
* This software was developed by SRI International and the University of
* Cambridge Computer Laboratory (Department of Computer Science and
@ -12,6 +12,9 @@
* Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
* ("CTSRD"), as part of the DARPA CRASH research programme.
*
* This work was supported by Innovate UK project 105694, "Digital Security by
* Design (DSbD) Technology Platform Prototype".
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@ -37,29 +40,9 @@
*/
#pragma once
/* <bits/fcntl.h> includes <bits/stat.h> which contains a member __unused */
#include "__unused_workaround_start.h"
#include_next <fcntl.h>
#include "__unused_workaround_end.h"
#ifdef __unused_undefd
#undef __unused_undefd
#define __unused __attribute__((unused))
#endif
#include <sys/file.h>
#ifndef O_EXLOCK
#define O_EXLOCK (1 << 30)
#endif
#ifndef O_SHLOCK
#define O_SHLOCK (1 << 31)
#endif
#undef open
#define open(path, flags, ...) ({ \
int __fd = (open)(path, flags, ##__VA_ARGS__); \
if (flags & O_EXLOCK) flock(__fd, LOCK_EX); \
if (flags & O_SHLOCK) flock(__fd, LOCK_SH); \
__fd; })