diff mbox

RFR: A couple of build fixes

Message ID 1379692911.17280.4.camel@localhost.localdomain
State Accepted
Headers show

Commit Message

Edward Nevill Sept. 20, 2013, 4:01 p.m. UTC 
Hi,

Below are fixes for a couple of build problems.

1) make zero cross build work again
2) make self hosted build work on RTSM model.

OK to push?
Ed.

--- CUT HERE ---
exporting patch:
# HG changeset patch
# User Edward Nevill edward.nevill@linaro.org
# Date 1379689177 -3600
#      Fri Sep 20 15:59:37 2013 +0100
# Node ID 731e43d74e37ccb378cd52fd426f1c321ed1295f
# Parent  7932538a0cc016e721449ede2ca511a953f20e81
Make zero cross compile build work again

Comments

Andrew Haley Sept. 21, 2013, 9:27 a.m. UTC | #1 
On 09/20/2013 05:01 PM, Edward Nevill wrote:
> OK to push?

Yes, thanks.

Andrew.
diff mbox

Patch

diff -r 7932538a0cc0 -r 731e43d74e37 make/linux/makefiles/gcc.make
--- 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
diff -r 7932538a0cc0 -r 731e43d74e37 src/cpu/zero/vm/globals_zero.hpp
--- 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
--- CUT HERE ---

--- CUT HERE ---
exporting patch:
# HG changeset patch
# User Edward Nevill edward.nevill@linaro.org
# Date 1379692792 -3600
#      Fri Sep 20 16:59:52 2013 +0100
# Node ID 1ad828f81a1b51c724a02d4e107824dddb4242ec
# Parent  e9b5be85ca1dfbe9b2ead47614705d341c35183b
Fix self hosted build on RTSM model

diff -r e9b5be85ca1d -r 1ad828f81a1b common/autoconf/build-aux/autoconf-config.guess
--- a/common/autoconf/build-aux/autoconf-config.guess	Fri Aug 16 12:12:19 2013 +0100
+++ b/common/autoconf/build-aux/autoconf-config.guess	Fri Sep 20 16:59:52 2013 +0100
@@ -989,6 +989,9 @@ 
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
+    aarch64:Linux:*:*)
+	echo aarch64-unknown-linux-gnu
+	exit ;;
     xtensa*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
--- CUT HERE ---