Skip to content

Commit 2da2c76

Browse files
authored
Merge pull request #8211 from tautschnig/features/hurd
Add support for GNU Hurd
2 parents 905033e + 6950014 commit 2da2c76

File tree

7 files changed

+10
-7
lines changed

7 files changed

+10
-7
lines changed

doc/man/cbmc.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ Set analysis architecture, which defaults to the host architecture. Use one of:
202202
\fB\-\-os\fR \fIos\fR
203203
Set analysis operating system, which defaults to the host operating system. Use
204204
one of: \fBfreebsd\fR, \fBlinux\fR, \fBmacos\fR, \fBnetbsd\fR, \fBopenbsd\fR,
205-
\fBsolaris\fR, or \fBwindows\fR.
205+
\fBsolaris\fR, \fBhurd\fR, or \fBwindows\fR.
206206
.TP
207207
\fB\-\-i386\-linux\fR, \fB\-\-i386\-win32\fR, \fB\-\-i386\-macos\fR, \fB\-\-ppc\-macos\fR, \fB\-\-win32\fR, \fB\-\-winx64\fR
208208
Set analysis architecture and operating system.

doc/man/goto-analyzer.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ Set analysis architecture, which defaults to the host architecture. Use one of:
461461
\fB\-\-os\fR \fIos\fR
462462
Set analysis operating system, which defaults to the host operating system. Use
463463
one of: \fBfreebsd\fR, \fBlinux\fR, \fBmacos\fR, \fBnetbsd\fR, \fBopenbsd\fR,
464-
\fBsolaris\fR, or \fBwindows\fR.
464+
\fBsolaris\fR, \fBhurd\fR, or \fBwindows\fR.
465465
.TP
466466
\fB\-\-i386\-linux\fR, \fB\-\-i386\-win32\fR, \fB\-\-i386\-macos\fR, \fB\-\-ppc\-macos\fR, \fB\-\-win32\fR, \fB\-\-winx64\fR
467467
Set analysis architecture and operating system.

doc/man/janalyzer.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ Set analysis architecture, which defaults to the host architecture. Use one of:
279279
\fB\-\-os\fR \fIos\fR
280280
Set analysis operating system, which defaults to the host operating system. Use
281281
one of: \fBfreebsd\fR, \fBlinux\fR, \fBmacos\fR, \fBnetbsd\fR, \fBopenbsd\fR,
282-
\fBsolaris\fR, or \fBwindows\fR.
282+
\fBsolaris\fR, \fBhurd\fR, or \fBwindows\fR.
283283
.TP
284284
\fB\-\-i386\-linux\fR, \fB\-\-i386\-win32\fR, \fB\-\-i386\-macos\fR, \fB\-\-ppc\-macos\fR, \fB\-\-win32\fR, \fB\-\-winx64\fR
285285
Set analysis architecture and operating system.

doc/man/jbmc.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Set analysis architecture, which defaults to the host architecture. Use one of:
8383
\fB\-\-os\fR \fIos\fR
8484
Set analysis operating system, which defaults to the host operating system. Use
8585
one of: \fBfreebsd\fR, \fBlinux\fR, \fBmacos\fR, \fBnetbsd\fR, \fBopenbsd\fR,
86-
\fBsolaris\fR, or \fBwindows\fR.
86+
\fBsolaris\fR, \fBhurd\fR, or \fBwindows\fR.
8787
.TP
8888
\fB\-\-i386\-linux\fR, \fB\-\-i386\-win32\fR, \fB\-\-i386\-macos\fR, \fB\-\-ppc\-macos\fR, \fB\-\-win32\fR, \fB\-\-winx64\fR
8989
Set analysis architecture and operating system.

src/goto-cc/hybrid_binary.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ int hybrid_binary(
4949
int result = 0;
5050

5151
#if defined(__linux__) || defined(__FreeBSD_kernel__) || \
52-
defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
52+
defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
53+
defined(__gnu_hurd__)
5354
// we can use objcopy for both object files and executables
5455
(void)building_executable;
5556

src/util/config.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -985,7 +985,7 @@ bool configt::set(const cmdlinet &cmdline)
985985
ansi_c.mode = ansi_ct::flavourt::CLANG;
986986
ansi_c.preprocessor=ansi_ct::preprocessort::CLANG;
987987
}
988-
else if(os == "linux" || os == "solaris" || os == "netbsd")
988+
else if(os == "linux" || os == "solaris" || os == "netbsd" || os == "hurd")
989989
{
990990
ansi_c.lib=configt::ansi_ct::libt::LIB_FULL;
991991
ansi_c.os=configt::ansi_ct::ost::OS_LINUX;
@@ -1509,6 +1509,8 @@ irep_idt configt::this_operating_system()
15091509
this_os="linux";
15101510
#elif __SVR4
15111511
this_os="solaris";
1512+
#elif __gnu_hurd__
1513+
this_os = "hurd";
15121514
#else
15131515
this_os="unknown";
15141516
#endif

src/util/config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class symbol_table_baset;
107107
"set operating system (default: " + \
108108
id2string(configt::this_operating_system()) + \
109109
") to one of: {yfreebsd}, {ylinux}, {ymacos}, {ynetbsd}, {yopenbsd}, " \
110-
"{ysolaris}, or {ywindows}\n" \
110+
"{ysolaris}, {yhurd}, or {ywindows}\n" \
111111
" {y--i386-linux}, {y--i386-win32}, {y--i386-macos}, {y--ppc-macos}, " \
112112
"{y--win32}, {y--winx64} \t " \
113113
"set architecture and operating system\n" \

0 commit comments

Comments
 (0)