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

* grub-core/genmod.sh.in: Rewrite the Apple part.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-29 16:00:27 +01:00
parent 4f3aa1af70
commit 31a12124a0
2 changed files with 44 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-02-29 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/genmod.sh.in: Rewrite the Apple part.
2012-02-29 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-29 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/machoXX.c (grub_macho_load): Fix signed vs unsigned * grub-core/loader/machoXX.c (grub_macho_load): Fix signed vs unsigned

27
grub-core/genmod.sh.in
View file

@ -35,6 +35,7 @@ deps=`grep ^$modname: $moddep | sed s@^.*:@@`
# remove old files if any # remove old files if any
rm -f $tmpfile $outfile rm -f $tmpfile $outfile
if test x@TARGET_APPLE_CC@ != x1; then
# stripout .modname and .moddeps sections from input module # stripout .modname and .moddeps sections from input module
@OBJCOPY@ -R .modname -R .moddeps $infile $tmpfile @OBJCOPY@ -R .modname -R .moddeps $infile $tmpfile
@ -52,7 +53,6 @@ else
fi fi
rm -f $t1 $t2 rm -f $t1 $t2
if test x@TARGET_APPLE_CC@ != x1; then
if ! test -z "${TARGET_OBJ2ELF}"; then if ! test -z "${TARGET_OBJ2ELF}"; then
./${TARGET_OBJ2ELF} $tmpfile || exit 1 ./${TARGET_OBJ2ELF} $tmpfile || exit 1
fi fi
@ -63,12 +63,33 @@ if test x@TARGET_APPLE_CC@ != x1; then
-R .note.GNU-stack -R .note -R .comment $tmpfile || exit 1 -R .note.GNU-stack -R .note -R .comment $tmpfile || exit 1
fi fi
else else
# XXX Test these Apple CC fixes tmpfile2=${outfile}.tmp2
t1=${outfile}.t1.c
t2=${outfile}.t2.c
# remove old files if any
rm -f $t1 $t2
cp $infile $tmpfile
# Attach .modname and .moddeps sections
echo "char modname[] __attribute__ ((section(\"_modname, _modname\"))) = \"$modname\";" >$t1
for dep in $deps; do echo "char moddep_$dep[] __attribute__ ((section(\"_moddeps, _moddeps\"))) = \"$dep\";" >$t2; done
if test -n "$deps"; then
@TARGET_CC@ @TARGET_LDFLAGS@ -ffreestanding -nostdlib -o $tmpfile2 $t1 $t2 $tmpfile -Wl,-r,-d
else
@TARGET_CC@ @TARGET_LDFLAGS@ -ffreestanding -nostdlib -o $tmpfile2 $t1 $tmpfile -Wl,-r,-d
fi
rm -f $t1 $t2 $tmpfile
mv $tmpfile2 $tmpfile
cp $tmpfile $tmpfile.bin cp $tmpfile $tmpfile.bin
@OBJCONV@ -f@TARGET_MODULE_FORMAT@ \ @OBJCONV@ -f@TARGET_MODULE_FORMAT@ \
-nr:_grub_mod_init:grub_mod_init \ -nr:_grub_mod_init:grub_mod_init \
-nr:_grub_mod_fini:grub_mod_fini \ -nr:_grub_mod_fini:grub_mod_fini \
-wd1106 -ew2030 -ew2050 -nu -nd $tmpfile.bin $tmpfile || exit 1 -wd1106 -ew2030 -ew2050 -ew2031 -nu -nd $tmpfile.bin $tmpfile || exit 1
rm -f $name.bin rm -f $name.bin
fi fi
mv $tmpfile $outfile mv $tmpfile $outfile