[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] config/x86: tidy {Free,Open}BSD LDFLAGS_DIRECT handling


  • To: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Jan Beulich <jbeulich@xxxxxxxx>
  • Date: Thu, 11 Aug 2022 14:14:51 +0200
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pyFc4NWRO6qB3BSVKcXz9B1gIArA808DxqvfItKNDBs=; b=F2t3wC1XbqJ1OSxSD13NQ//7wnzFIec6gcklexFfWGATSkel1Sw/TYEVhj2YBXI8A5X4jxTc6TESEdMoAwplbb11oAKfv9W9KYiNvx55RBoATelMQ2ef1waHC+eliR8H0XS+NB3sjGGTRN+jCWJqK30ZCuUge/Xu7xAaQkhw3thJvyB7WCc6/sMJBEsBNEmDoKW1HcPTzjxaXYtlycxqtV3+x58BhPZPU+BvOyH5ENAnAyOJdnbwS+m6jsYKSSSje688RA9it1jrkcUNbuAkliUBgNRyRTUgUwRclKubE+gEcKVQJjV0wZqt2H+B/b6o/K1Y5mW9cxwBHMxAmpgqQA==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WOOXpVApNrSgBgt9wbX9F+zJeswgqm5hA/hF9kWYbaEe2PFszQHz6KSMXPH+5DhqvKCCTGwiKvpoP5L+ImMfzuRMstZ5eqiOBeBu2BWqUVKwolzgUVOpKnV4YObrCNdLqGFOCsT3y8anCczjs8X50tOQwAzCfucZRh691Mr7BpZ/yKQXU8NJYjp16BVTPvTwgBLcYgkx1R5UCPzR+rw0fxMhy1wj29L4wmAWvFiyjurf9Y/dtAI15a1Rt2T8CpHBlTsdjTB0VW23Dn7O3EJnQB8MOpgD81BRqy1nlR6YxuYPL81GOrOrEunuxX4TNOxCFbk770pVKrlCERcKkwha7w==
  • Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com;
  • Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, George Dunlap <george.dunlap@xxxxxxxxxx>, Julien Grall <julien@xxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>
  • Delivery-date: Thu, 11 Aug 2022 12:15:02 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

It's not clear why for x86-64 a different approach was used than the
(shorter) one x86-32 has been using. Move the LDFLAGS_DIRECT_*BSD
setting to the respective OS files and reuse x86-32's approach for
x86-64.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
---
I was actually inclined to go further and rename the variable(s) as
well, to e.g. XEN_ELF_SUB_FLAVOR, at the same time eliminating the
indirection via $(XEN_OS).

--- a/config/FreeBSD.mk
+++ b/config/FreeBSD.mk
@@ -1,5 +1,7 @@
 include $(XEN_ROOT)/config/StdGNU.mk
 
+LDFLAGS_DIRECT_FreeBSD = _fbsd
+
 # No wget on FreeBSD base system
 WGET = ftp
 PKG_INSTALLDIR = ${prefix}/libdata/pkgconfig
--- a/config/OpenBSD.mk
+++ b/config/OpenBSD.mk
@@ -1 +1,3 @@
 include $(XEN_ROOT)/config/StdGNU.mk
+
+LDFLAGS_DIRECT_OpenBSD = _obsd
--- 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))
 
 IOEMU_CPU_ARCH ?= i386
--- 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$(LDFLAGS_DIRECT_$(XEN_OS))
 
 IOEMU_CPU_ARCH ?= x86_64



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.