From: Mark H Weaver <mhw@netris.org>
To: Andrei Borzenkov <arvidjaar@gmail.com>
Cc: The development of GNU GRUB <grub-devel@gnu.org>
Subject: [PATCH v2] Ensure that MIPS target code is compiled for the O32 ABI.
Date: Mon, 24 Aug 2015 02:50:23 -0400 [thread overview]
Message-ID: <87a8thuqmo.fsf_-_@netris.org> (raw)
In-Reply-To: <55D99791.4080104@gmail.com> (Andrei Borzenkov's message of "Sun, 23 Aug 2015 12:51:13 +0300")
Include -mabi=32 in CFLAGS_PLATFORM and CCASFLAGS_PLATFORM to compile
code for the O32 ABI when targetting MIPS, since the MIPS assembly code
in GRUB assumes this. This flag is also needed when compiling
asm-tests/mips.S from configure, because GNU as rejects MIPS register
names such as $t2 unless the O32 ABI is selected.
This is needed when using a compiler that defaults to one of the newer
MIPS ABIs such as N32 or N64, e.g. when natively compiling on a system
that uses one of these newer MIPS ABIs.
---
conf/Makefile.common | 4 ++++
configure.ac | 7 +++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/conf/Makefile.common b/conf/Makefile.common
index fcb8d2e..bd125da 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -20,6 +20,10 @@ endif
if COND_powerpc_ieee1275
CFLAGS_PLATFORM += -mcpu=powerpc
endif
+if COND_mips
+ CFLAGS_PLATFORM += -mabi=32
+ CCASFLAGS_PLATFORM = -mabi=32
+endif
#FIXME: discover and check XEN headers
CPPFLAGS_XEN = -I/usr/include
diff --git a/configure.ac b/configure.ac
index c864311..1f5e8a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,8 @@
# Process this file with autoconf to produce a configure script.
-# Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc.
+# Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,
+# 2012,2013,2014,2015 Free Software Foundation, Inc.
#
# This configure.ac is free software; the author
# gives unlimited permission to copy and/or distribute it,
@@ -599,9 +600,11 @@ fi
AC_CACHE_CHECK([for options to compile assembly], [grub_cv_cc_target_asm_compile], [
test_program=
+test_ccasflags=
case "x$target_cpu-$platform" in
xmips-* | xmipsel-*)
test_program=mips
+ test_ccasflags=-mabi=32
;;
xi386-pc)
test_program=i386-pc
@@ -618,7 +621,7 @@ if test x"$test_program" = x ; then
else
found=no
for arg in "" "-no-integrated-as"; do
- cmdline="$TARGET_CC -c -o /dev/null $TARGET_CCASFLAGS $arg $TARGET_CPPFLAGS $srcdir/asm-tests/$test_program.S"
+ cmdline="$TARGET_CC -c -o /dev/null $TARGET_CCASFLAGS $test_ccasflags $arg $TARGET_CPPFLAGS $srcdir/asm-tests/$test_program.S"
echo "Running $cmdline" >&AS_MESSAGE_LOG_FD
if $cmdline >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
grub_cv_cc_target_asm_compile="$arg"
--
2.5.0
next prev parent reply other threads:[~2015-08-24 14:19 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-19 18:35 [PATCH] Ensure that MIPS target code is compiled for the O32 ABI Mark H Weaver
2015-08-21 4:05 ` Andrei Borzenkov
2015-08-22 18:04 ` Mark H Weaver
2015-08-23 9:51 ` Andrei Borzenkov
2015-08-23 17:27 ` Mark H Weaver
2015-08-24 6:50 ` Mark H Weaver [this message]
2015-09-08 17:11 ` [PATCH v2] " Vladimir 'φ-coder/phcoder' Serbinenko
2015-09-09 1:37 ` Mark H Weaver
2015-09-13 6:32 ` Andrei Borzenkov
2015-10-09 21:14 ` Vladimir 'φ-coder/phcoder' Serbinenko
2015-10-10 0:28 ` Vladimir 'φ-coder/phcoder' Serbinenko
2015-10-14 4:49 ` Andrei Borzenkov
2015-10-14 12:16 ` Vladimir 'phcoder' Serbinenko
2015-10-14 17:57 ` Andrei Borzenkov
2015-08-24 7:19 ` [PATCH] " Andrei Borzenkov
2015-08-24 7:57 ` Mark H Weaver
2015-08-24 8:12 ` Andrei Borzenkov
2015-08-24 9:27 ` Andrei Borzenkov
2015-08-25 18:18 ` Mark H Weaver
2015-09-11 15:06 ` Andrei Borzenkov
2015-09-13 2:41 ` Mark H Weaver
2015-09-13 3:46 ` Mark H Weaver
2015-09-13 14:10 ` Andrei Borzenkov
2015-09-13 23:37 ` Mark H Weaver
2015-09-20 4:44 ` Andrei Borzenkov
2015-09-21 16:09 ` Mark H Weaver
2015-09-21 17:56 ` Andrei Borzenkov
2015-09-22 15:03 ` Mark H Weaver
2015-09-22 17:26 ` Andrei Borzenkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a8thuqmo.fsf_-_@netris.org \
--to=mhw@netris.org \
--cc=arvidjaar@gmail.com \
--cc=grub-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.