[mini-os] x86: fix building with Clang

Commit Message

Jan Beulich Dec. 6, 2023, 10:59 a.m. UTC

It doesn't understand -fno-reorder-blocks. Whether without that option
the resulting binary is actually functional I can't tell, though.

For $(cc-option ...) to be usable in arch.mk, at least CC needs setting
earlier in Config.mk. Move up the entire "Set tools" section.

Signed-off-by: Jan Beulich <[e-mail]>
---
Observed with Clang7, but then checked option (un)availability with
godbolt.org.

With Clang5 there's further breakage, due to apparently deliberate de-
referencing of NULL in lib/xmalloc.c (poor man's BUG(), as it looks).
The compiler's -Wnull-dereference causes a warning to be issued there,
converted to an error by -Werror. Question is whether building with
Clang5 is supposed to work.

Comments

Jürgen Groß Dec. 6, 2023, 11:45 a.m. UTC | #1

On 06.12.23 11:59, Jan Beulich wrote:
> It doesn't understand -fno-reorder-blocks. Whether without that option
> the resulting binary is actually functional I can't tell, though.
> 
> For $(cc-option ...) to be usable in arch.mk, at least CC needs setting
> earlier in Config.mk. Move up the entire "Set tools" section.
> 
> Signed-off-by: Jan Beulich <[e-mail]>

Reviewed-by: Juergen Gross <[e-mail]>


Juergen

Patch

--- a/Config.mk
+++ b/Config.mk
@@ -86,6 +86,33 @@  TARGET_ARCH_DIR := arch/$(TARGET_ARCH_FA
 export TARGET_ARCH_DIR
 export TARGET_ARCH_FAM
 
+# Set tools
+AS         = $(CROSS_COMPILE)as
+LD         = $(CROSS_COMPILE)ld
+ifeq ($(clang),y)
+CC         = $(CROSS_COMPILE)clang
+LD_LTO     = $(CROSS_COMPILE)llvm-ld
+else
+CC         = $(CROSS_COMPILE)gcc
+LD_LTO     = $(CROSS_COMPILE)ld
+endif
+CPP        = $(CC) -E
+AR         = $(CROSS_COMPILE)ar
+RANLIB     = $(CROSS_COMPILE)ranlib
+NM         = $(CROSS_COMPILE)nm
+STRIP      = $(CROSS_COMPILE)strip
+OBJCOPY    = $(CROSS_COMPILE)objcopy
+OBJDUMP    = $(CROSS_COMPILE)objdump
+SIZEUTIL   = $(CROSS_COMPILE)size
+
+# Allow git to be wrappered in the environment
+GIT        ?= git
+
+INSTALL      = install
+INSTALL_DIR  = $(INSTALL) -d -m0755 -p
+INSTALL_DATA = $(INSTALL) -m0644 -p
+INSTALL_PROG = $(INSTALL) -m0755 -p
+
 # This is used for architecture specific links.
 # This can be overwritten from arch specific rules.
 ARCH_LINKS =
@@ -119,33 +147,6 @@  DEF_CPPFLAGS += -isystem $(LWIPDIR)/src/
 DEF_CPPFLAGS += -isystem $(LWIPDIR)/src/include/ipv4
 endif
 
-# Set tools
-AS         = $(CROSS_COMPILE)as
-LD         = $(CROSS_COMPILE)ld
-ifeq ($(clang),y)
-CC         = $(CROSS_COMPILE)clang
-LD_LTO     = $(CROSS_COMPILE)llvm-ld
-else
-CC         = $(CROSS_COMPILE)gcc
-LD_LTO     = $(CROSS_COMPILE)ld
-endif
-CPP        = $(CC) -E
-AR         = $(CROSS_COMPILE)ar
-RANLIB     = $(CROSS_COMPILE)ranlib
-NM         = $(CROSS_COMPILE)nm
-STRIP      = $(CROSS_COMPILE)strip
-OBJCOPY    = $(CROSS_COMPILE)objcopy
-OBJDUMP    = $(CROSS_COMPILE)objdump
-SIZEUTIL   = $(CROSS_COMPILE)size
-
-# Allow git to be wrappered in the environment
-GIT        ?= git
-
-INSTALL      = install
-INSTALL_DIR  = $(INSTALL) -d -m0755 -p
-INSTALL_DATA = $(INSTALL) -m0644 -p
-INSTALL_PROG = $(INSTALL) -m0755 -p
-
 BOOT_DIR ?= /boot
 
 SOCKET_LIBS =
--- a/arch/x86/arch.mk
+++ b/arch/x86/arch.mk
@@ -14,7 +14,8 @@  EXTRA_SRC += arch/$(EXTRA_INC)
 endif
 
 ifeq ($(MINIOS_TARGET_ARCH),x86_64)
-ARCH_CFLAGS := -m64 -mno-red-zone -fno-reorder-blocks
+ARCH_CFLAGS := -m64 -mno-red-zone
+ARCH_CFLAGS += $(call cc-option,$(CC),-fno-reorder-blocks)
 ARCH_CFLAGS += -fno-asynchronous-unwind-tables
 ARCH_ASFLAGS := -m64
 ARCH_LDFLAGS := -m elf_x86_64