diff options
| author | Marek Habersack <grendel@twistedcode.net> | 2018-09-21 21:26:33 +0300 |
|---|---|---|
| committer | Ludovic Henry <luhenry@microsoft.com> | 2018-09-21 21:26:33 +0300 |
| commit | 4a2c6c26ded8794433839efb639c102f1c3086af (patch) | |
| tree | 6c891f6c9d6169f6eb31e17dd2e015dae0a6b8d5 /sdks/builds/runtime.mk | |
| parent | 70c2a07a7653bc48ce119490e7f0ae53c862300b (diff) | |
[SDKS] Build host runtime with correct bitness (#10711)
When building 32-bit binaries on a 64-bit system and vice versa, it is necessary
to pass the `-m32` or `-m64` compiler flags, respectively. Failure to do so will
result not only in linking problems (different binary architecture) but also in
problems when using some system headers which are sensitive to the architecture.
For instance, `ucontext.h` contains register set definitions for different
architectures and building Mono runtime with a 64-bit compiler targetting 32-bit
architecture results in this error:
.../mono/mono/utils/mono-sigcontext.h:173:74: error: ‘REG_EIP’ undeclared (first use in this function); did you mean ‘REG_RIP’?
#define UCONTEXT_REG_EIP(ctx) (((ucontext_t*)(ctx))->uc_mcontext.gregs [REG_EIP])
The issue here is that the compiler defines the `__x86_64__` macro which causes
`ucontext.h` to choose declarations for amd64 (which does not use `REG_EIP` but
has `REG_RIP` instead) while Mono runtime assumes its building for a 32-bit host
and uses 32-bit register names. Passing `-m32` to the compiler will fix the
issue as now the compiler will define the `__i386__` macro and all parties will
agree where they are and what they want.
This commit uses a rather baroque statement when constructing compiler flags to
build the Mono runtime to check whether the host triple targets 32 or 64-bit
host and adds the appropriate flag.
Diffstat (limited to 'sdks/builds/runtime.mk')
| -rw-r--r-- | sdks/builds/runtime.mk | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/sdks/builds/runtime.mk b/sdks/builds/runtime.mk index 200bebd8966..fa63d9cf002 100644 --- a/sdks/builds/runtime.mk +++ b/sdks/builds/runtime.mk @@ -25,10 +25,20 @@ # _$(1)_PATH define RuntimeTemplate -_runtime_$(1)_CFLAGS=$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) $$(_$(1)_CFLAGS) $$($(1)_CFLAGS) -_runtime_$(1)_CXXFLAGS=$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) $$(_$(1)_CXXFLAGS) $$($(1)_CXXFLAGS) -_runtime_$(1)_CPPFLAGS=$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) $$(_$(1)_CPPFLAGS) $$($(1)_CPPFLAGS) -_runtime_$(1)_CXXCPPFLAGS=$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) $$(_$(1)_CXXCPPFLAGS) $$($(1)_CXXCPPFLAGS) +_runtime_$(1)_BITNESS=$$(if $$(findstring i686,$(2)),-m32) + +ifeq ($$(_runtime_$(1)_BITNESS),) +_runtime_$(1)_BITNESS=$$(if $$(findstring i386,$(2)),-m32) +endif + +ifeq ($$(_runtime_$(1)_BITNESS),) +_runtime_$(1)_BITNESS=$$(if $$(findstring x86_64,$(2)),-m64) +endif + +_runtime_$(1)_CFLAGS=$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) $$(_$(1)_CFLAGS) $$($(1)_CFLAGS) $$(_runtime_$(1)_BITNESS) +_runtime_$(1)_CXXFLAGS=$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) $$(_$(1)_CXXFLAGS) $$($(1)_CXXFLAGS) $$(_runtime_$(1)_BITNESS) +_runtime_$(1)_CPPFLAGS=$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) $$(_$(1)_CPPFLAGS) $$($(1)_CPPFLAGS) $$(_runtime_$(1)_BITNESS) +_runtime_$(1)_CXXCPPFLAGS=$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) $$(_$(1)_CXXCPPFLAGS) $$($(1)_CXXCPPFLAGS) $$(_runtime_$(1)_BITNESS) _runtime_$(1)_LDFLAGS=$$(_$(1)_LDFLAGS) $$($(1)_LDFLAGS) _runtime_$(1)_AC_VARS=$$(_$(1)_AC_VARS) $$($(1)_AC_VARS) |