Skip to content

build: Avoid forcing -include arch/config.h into global CFLAGS/AFLAGS #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bernhardkaindl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

build: Avoid forcing -include arch/config.h into global CFLAGS/AFLAGS #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ define PERENV_setup
AFLAGS_$($(1)_arch) := $$(COMMON_AFLAGS) $$(COMMON_AFLAGS-$($(1)_arch))
CFLAGS_$($(1)_arch) := $$(COMMON_CFLAGS) $$(COMMON_CFLAGS-$($(1)_arch))

AFLAGS_$(1) := $$(AFLAGS_$($(1)_arch)) $$(COMMON_AFLAGS-$(1)) -DCONFIG_ENV_$(1) -include arch/config.h
CFLAGS_$(1) := $$(CFLAGS_$($(1)_arch)) $$(COMMON_CFLAGS-$(1)) -DCONFIG_ENV_$(1) -include arch/config.h
AFLAGS_$(1) := $$(AFLAGS_$($(1)_arch)) $$(COMMON_AFLAGS-$(1)) -DCONFIG_ENV_$(1)
CFLAGS_$(1) := $$(CFLAGS_$($(1)_arch)) $$(COMMON_CFLAGS-$(1)) -DCONFIG_ENV_$(1)

link-$(1) := $(ROOT)/arch/x86/link-$(1).lds

Expand Down
6 changes: 6 additions & 0 deletions include/xtf/compiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
#ifndef XTF_COMPILER_H
#define XTF_COMPILER_H

#if defined(CONFIG_ENV_pv64) || defined(CONFIG_ENV_pv32pae) || \
defined(CONFIG_ENV_hvm64) || defined(CONFIG_ENV_hvm32pae) || \
defined(CONFIG_ENV_hvm32pse) || defined(CONFIG_ENV_hvm32)
#include <arch/config.h>
#endif

#ifdef __GNUC__
#include <xtf/compiler-gcc.h>
#endif
Expand Down
6 changes: 6 additions & 0 deletions include/xtf/numbers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
#ifndef XTF_NUMBERS_H
#define XTF_NUMBERS_H

#if defined(CONFIG_ENV_pv64) || defined(CONFIG_ENV_pv32pae) || \
defined(CONFIG_ENV_hvm64) || defined(CONFIG_ENV_hvm32pae) || \
defined(CONFIG_ENV_hvm32pse) || defined(CONFIG_ENV_hvm32)
#include <arch/config.h>
#endif

/**
* Create an integer usable in both C and Assembly, even when @p suf is
* needed.
Expand Down
Loading