Mercurial > hg > aarch64-jdk8u51-b16-hotspot
changeset 5103:731e43d74e37
Make zero cross compile build work again
| author | Edward Nevill edward.nevill@linaro.org |
|---|---|
| date | Fri, 20 Sep 2013 15:59:37 +0100 |
| parents | 7932538a0cc0 |
| children | f56ae2c42b1c |
| files | make/linux/makefiles/gcc.make src/cpu/zero/vm/globals_zero.hpp |
| diffstat | 2 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/make/linux/makefiles/gcc.make Fri Sep 20 08:39:00 2013 +0100 +++ b/make/linux/makefiles/gcc.make Fri Sep 20 15:59:37 2013 +0100 @@ -239,6 +239,7 @@ DEBUG_CFLAGS/aarch64 = -g DEBUG_CFLAGS/arm = -g DEBUG_CFLAGS/ppc = -g + DEBUG_CFLAGS/zero = -g DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH)) ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),) DEBUG_CFLAGS += -gstabs @@ -250,6 +251,7 @@ FASTDEBUG_CFLAGS/aarch64 = -g FASTDEBUG_CFLAGS/arm = -g FASTDEBUG_CFLAGS/ppc = -g + FASTDEBUG_CFLAGS/zero = -g FASTDEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH)) ifeq ($(FASTDEBUG_CFLAGS/$(BUILDARCH)),) FASTDEBUG_CFLAGS += -gstabs @@ -260,6 +262,7 @@ OPT_CFLAGS/aarch64 = -g OPT_CFLAGS/arm = -g OPT_CFLAGS/ppc = -g + OPT_CFLAGS/zero = -g OPT_CFLAGS += $(OPT_CFLAGS/$(BUILDARCH)) ifeq ($(OPT_CFLAGS/$(BUILDARCH)),) OPT_CFLAGS += -gstabs
--- a/src/cpu/zero/vm/globals_zero.hpp Fri Sep 20 08:39:00 2013 +0100 +++ b/src/cpu/zero/vm/globals_zero.hpp Fri Sep 20 15:59:37 2013 +0100 @@ -57,6 +57,12 @@ // GC Ergo Flags define_pd_global(intx, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread +#ifdef AARCH64 +// This is declared as _pd for AARCH64 only in globals.hpp +// so must match with definition here. +define_pd_global(bool, UseBiasedLocking, false); +#endif + #define ARCH_FLAGS(develop, product, diagnostic, experimental, notproduct) #endif // CPU_ZERO_VM_GLOBALS_ZERO_HPP