[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] config/x86: tidy {Free,Open}BSD LDFLAGS_DIRECT handling
commit 0c614af4a73b77baf1d711c68b8ee0278d7a97a6 Author: Jan Beulich <jbeulich@xxxxxxxx> AuthorDate: Fri Aug 12 08:54:33 2022 +0200 Commit: Jan Beulich <jbeulich@xxxxxxxx> CommitDate: Fri Aug 12 08:54:33 2022 +0200 config/x86: tidy {Free,Open}BSD LDFLAGS_DIRECT handling It's not clear why for x86-64 a different approach was used than the (shorter) one x86-32 has been using. Move the setting to the respective OS files and reuse x86-32's approach for x86-64, while at the same time using an OS-independent variable name (thus avoiding the indirection through $(XEN_OS)). Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx> Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> --- config/FreeBSD.mk | 2 ++ config/OpenBSD.mk | 2 ++ config/x86_32.mk | 4 +--- config/x86_64.mk | 10 +--------- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/config/FreeBSD.mk b/config/FreeBSD.mk index 98a5117e60..0062902b25 100644 --- a/config/FreeBSD.mk +++ b/config/FreeBSD.mk @@ -1,5 +1,7 @@ include $(XEN_ROOT)/config/StdGNU.mk +XEN_ELF_SUB_FLAVOR = _fbsd + # No wget on FreeBSD base system WGET = ftp PKG_INSTALLDIR = ${prefix}/libdata/pkgconfig diff --git a/config/OpenBSD.mk b/config/OpenBSD.mk index b421a1c840..6a6bf304f0 100644 --- a/config/OpenBSD.mk +++ b/config/OpenBSD.mk @@ -1 +1,3 @@ include $(XEN_ROOT)/config/StdGNU.mk + +XEN_ELF_SUB_FLAVOR = _obsd diff --git a/config/x86_32.mk b/config/x86_32.mk index 29d13f7773..bc96ff013d 100644 --- a/config/x86_32.mk +++ b/config/x86_32.mk @@ -8,8 +8,6 @@ CONFIG_XCUTILS := y CFLAGS += -m32 -march=i686 # Use only if calling $(LD) directly. -LDFLAGS_DIRECT_OpenBSD = _obsd -LDFLAGS_DIRECT_FreeBSD = _fbsd -LDFLAGS_DIRECT += -melf_i386$(LDFLAGS_DIRECT_$(XEN_OS)) +LDFLAGS_DIRECT += -melf_i386$(XEN_ELF_SUB_FLAVOR) IOEMU_CPU_ARCH ?= i386 diff --git a/config/x86_64.mk b/config/x86_64.mk index 85fa27ca69..4afef44141 100644 --- a/config/x86_64.mk +++ b/config/x86_64.mk @@ -14,14 +14,6 @@ SunOS_LIBDIR = $(SunOS_LIBDIR_x86_64) EFI_DIR ?= /usr/lib64/efi # Use only if calling $(LD) directly. -ifeq ($(XEN_OS),OpenBSD) -LDFLAGS_DIRECT += -melf_x86_64_obsd -else -ifeq ($(XEN_OS),FreeBSD) -LDFLAGS_DIRECT += -melf_x86_64_fbsd -else -LDFLAGS_DIRECT += -melf_x86_64 -endif -endif +LDFLAGS_DIRECT += -melf_x86_64$(XEN_ELF_SUB_FLAVOR) IOEMU_CPU_ARCH ?= x86_64 -- generated by git-patchbot for /home/xen/git/xen.git#master
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |