Changeset a0a273e in mainline for HelenOS.config

Timestamp:

2017-10-03T18:12:17Z (7 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a41cda7

Parents:

0f28387

Message:

Unify compiler handling a bit.

Most compiler flags have been changed from GCC-specific to "common",
since code might build but not work properly without them.
Clang still rejects some of the flags, but at least we can see
the incompatibilities now.

Explicit —target flag was removed from clang, in favor of using clang
through a target-specific symlink. This allows clang to automatically
find correct assembler and linker, if it needs to.

Additionally, assembly language files are now compiled using $(CC)
whether or not they need the preprocessor. This allows clang to build
.s files using its integrated assembler.

File:

• HelenOS.config (modified) (2 diffs)

HelenOS.config

@@ -300 +300 @@
 @ "icc" Intel C Compiler
 @ "gcc_native" GNU C Compiler (native)
-! [PLATFORM=amd64|PLATFORM=ia32] COMPILER (choice)
-
-% Compiler
-@ "gcc_cross" GNU C Compiler (cross-compiler)
-@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
-@ "icc" Intel C Compiler
-@ "gcc_native" GNU C Compiler (native)
-! [PLATFORM=ia64] COMPILER (choice)
-
-% Compiler
-@ "gcc_cross" GNU C Compiler (cross-compiler)
-@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
-@ "gcc_native" GNU C Compiler (native)
-! [PLATFORM=riscv64] COMPILER (choice)
+! [PLATFORM=amd64|PLATFORM=ia32|PLATFORM=ia64] COMPILER (choice)
 
 % Compiler
@@ -320 +307 @@
 @ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
 @ "gcc_native" GNU C Compiler (native)
-! [PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=sparc64] COMPILER (choice)
-
+! [PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=sparc64|PLATFORM=riscv64] COMPILER (choice)
+
+% Clang Integrated Assembler
+@ "default" Use architecture default.
+@ "yes" Use integrated assembler.
+@ "no" Use GNU Assembler.
+! [COMPILER=clang] INTEGRATED_AS (choice)
 
 ## Cross-compiler target for abstract architecture