vbatts
/
grub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow compilation without thumb-interwork as long as no thumb is 

involved or only thumb2 is used.
This commit is contained in:
Vladimir Serbinenko 2013-12-18 13:33:39 +01:00
parent 063f2a04d1
commit a29f317af1
4 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2013-12-18 Vladimir Serbinenko <phcoder@gmail.com>
Allow compilation without thumb-interwork as long as no thumb is
involved or only thumb2 is used.
2013-12-18 Vladimir Serbinenko <phcoder@gmail.com>
Use -Wl,--no-relax rather than -mno-relax for uniformity.

1
INSTALL
View File

@ -17,6 +17,7 @@ configuring the GRUB.
much bigger binaries.
earlier versions not tested
Note: clang 3.2 or later works for arm
None of tested clang versions generated usable thumb code
earlier versions not tested
Note: clang 3.3 or later works for arm64
earlier versions have no arm64 support

2
conf/Makefile.common
View File

@ -15,8 +15,6 @@ if COND_sparc64_emu
LDFLAGS_PLATFORM = -Wl,--no-relax
endif
if COND_arm
CFLAGS_PLATFORM += -mthumb-interwork
CCASFLAGS_PLATFORM = -mthumb-interwork
if !COND_emu
LDFLAGS_PLATFORM = -Wl,--wrap=__clear_cache
endif

23
configure.ac
View File

@ -871,6 +871,29 @@ if test "x$target_cpu" = xarm; then
if test "x$grub_cv_cc_mlong_calls" = xyes; then
TARGET_CFLAGS="$TARGET_CFLAGS -mlong-calls"
fi
AC_CACHE_CHECK([whether option -mthumb-interwork works], grub_cv_cc_mthumb_interwork, [
CFLAGS="$TARGET_CFLAGS -mthumb-interwork -Werror"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
[grub_cv_cc_mthumb_interwork=yes],
[grub_cv_cc_mthumb_interwork=no])
])
if test "x$grub_cv_cc_mthumb_interwork" = xyes; then
TARGET_CFLAGS="$TARGET_CFLAGS -mthumb-interwork"
elif test "x$grub_cv_cc_target_clang" = xno ; then
AC_MSG_ERROR([your compiler doesn't support -mthumb-interwork])
else
CFLAGS="$TARGET_CFLAGS"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
#if defined (__thumb__) && !defined (__thumb2__)
#error thumb without interworking
#endif
]])],
[no_interwork_ok=yes],
[no_interwork_ok=no])
if test x$no_interwork_ok = xno ; then
AC_MSG_ERROR([attempt to compile to thumb with no thumb interwork])
fi
fi
fi
#