projects
/
debian
/
elilo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
orphan
[debian/elilo]
/
Make.defaults
diff --git
a/Make.defaults
b/Make.defaults
index 0a90776e0e2783c2fd7a3291460594addc86169f..e541ea86d77055f0ed561e52ffec9b17f59d9128 100644
(file)
--- a/
Make.defaults
+++ b/
Make.defaults
@@
-1,6
+1,7
@@
#
# Copyright (C) 2001-2003 Hewlett-Packard Co.
# Contributed by Stephane Eranian <eranian@hpl.hp.com>
#
# Copyright (C) 2001-2003 Hewlett-Packard Co.
# Contributed by Stephane Eranian <eranian@hpl.hp.com>
+# Contributed by Chandramouli Narayanan<mouli@linux.intel.com>
#
# This file is part of ELILO, the LINUX EFI boot loader.
#
#
# This file is part of ELILO, the LINUX EFI boot loader.
#
@@
-54,7
+55,7
@@
CONFIG_machspec_netconfig=y
# They are installed as part of the GNU-EFI package installation
#
EFIINC = /usr/include/efi
# They are installed as part of the GNU-EFI package installation
#
EFIINC = /usr/include/efi
-GNUEFILIB
= /usr/lib
+GNUEFILIB = /usr/lib
EFILIB = /usr/lib
EFICRT0 = /usr/lib
EFILIB = /usr/lib
EFICRT0 = /usr/lib
@@
-62,12
+63,12
@@
CDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
TOPDIR =
ARCH = $(shell uname -m | sed s,i[3456789]86,ia32,)
TOPDIR =
ARCH = $(shell uname -m | sed s,i[3456789]86,ia32,)
-INCDIR = -I. -I$(TOPDIR) -I$(EFIINC) -I$(EFIINC)/$(ARCH) -I$(EFIINC)/protocol
+INCDIR = -I. -I$(TOPDIR) -I$(EFIINC) -I$(EFIINC)/$(ARCH) -I$(EFIINC)/protocol
-I$(TOPDIR)/efi110
CPPFLAGS = -DCONFIG_$(ARCH)
OPTIMFLAGS = -O2
DEBUGFLAGS = -Wall
CPPFLAGS = -DCONFIG_$(ARCH)
OPTIMFLAGS = -O2
DEBUGFLAGS = -Wall
-CFLAGS
= $(OPTIMFLAGS)
-fpic -fshort-wchar $(DEBUGFLAGS)
+CFLAGS
= $(OPTIMFLAGS) -fno-stack-protector -fno-strict-aliasing
-fpic -fshort-wchar $(DEBUGFLAGS)
LDFLAGS = -nostdlib -znocombreloc
INSTALL = install
LDFLAGS = -nostdlib -znocombreloc
INSTALL = install
@@
-105,6
+106,12
@@
AR = $(prefix)ar
RANLIB = $(prefix)ranlib
OBJCOPY = $(prefix)objcopy
RANLIB = $(prefix)ranlib
OBJCOPY = $(prefix)objcopy
+# Use Modified binutils that supports x86_64 using UEFI ABI
+ifeq ($(ARCH), x86_64)
+ CFLAGS += -DEFI_FUNCTION_WRAPPER
+ OBJCOPY = /usr/bin/objcopy
+endif
+
ifeq ($(ARCH),ia64)
GCC_VERSION=$(shell $(CROSS_COMPILE)$(CC) -v 2>&1 | fgrep 'gcc version' | cut -f3 -d' ' | cut -f1 -d'.')
ifeq ($(ARCH),ia64)
GCC_VERSION=$(shell $(CROSS_COMPILE)$(CC) -v 2>&1 | fgrep 'gcc version' | cut -f3 -d' ' | cut -f1 -d'.')