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

2009-06-21 Robert Millan <rmh.grub@aybabtu.com>

Browse source 
Fix asm file handling on ELF, and remove workarounds.

        * genmk.rb (class Programs): Detect assembly files, and set ASFLAGS
        and -DASM_FILE=1 appropiately (copied from `class Images' stanza).
        * kern/i386/ieee1275/startup.S (ASM_FILE): Remove macro.
        * kern/i386/coreboot/startup.S (ASM_FILE): Likewise.
This commit is contained in:
robertmh 2009-06-21 17:24:30 +00:00
parent 3f3ec72b38
commit 15355c7d2f
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2009-06-21 Robert Millan <rmh.grub@aybabtu.com>
Fix asm file handling on ELF, and remove workarounds.
* genmk.rb (class Programs): Detect assembly files, and set ASFLAGS
and -DASM_FILE=1 appropiately (copied from `class Images' stanza).
* kern/i386/ieee1275/startup.S (ASM_FILE): Remove macro.
* kern/i386/coreboot/startup.S (ASM_FILE): Likewise.
2009-06-21 Vladimir Serbinenko <phcoder@gmail.com>
Load BSD ELF modules

4
genmk.rb
View file

@ -280,10 +280,12 @@ MOSTLYCLEANFILES += #{deps_str}
src = sources[i]
fake_obj = File.basename(src).suffix('o')
dep = deps[i]
flag = if /\.c$/ =~ src then 'CFLAGS' else 'ASFLAGS' end
extra_flags = if /\.S$/ =~ src then '-DASM_FILE=1' else '' end
dir = File.dirname(src)
"#{obj}: #{src} $(#{src}_DEPENDENCIES)
$(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(#{prefix}_CFLAGS) -MD -c -o $@ $<
$(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -MD -c -o $@ $<
-include #{dep}
"

2
kern/i386/coreboot/startup.S
View file

@ -16,8 +16,6 @@
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
#define ASM_FILE 1
#include <grub/symbol.h>
#include <grub/machine/memory.h>
#include <grub/cpu/linux.h>

2
kern/i386/ieee1275/startup.S
View file

@ -16,8 +16,6 @@
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
#define ASM_FILE 1
#include <grub/symbol.h>
#include <grub/machine/memory.h>
#include <grub/cpu/linux.h>