From patchwork Thu Nov 23 15:56:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 746481 Delivered-To: patch@linaro.org Received: by 2002:a5d:6706:0:b0:32d:baff:b0ca with SMTP id o6csp954321wru; Thu, 23 Nov 2023 07:57:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IE7NAfeUoBGFz+4LllMS+FkC54wUeHwZve1A8SKyf3p9u236+3STrwlfGkmFyETcsgSpT/f X-Received: by 2002:a67:f445:0:b0:45c:d357:290d with SMTP id r5-20020a67f445000000b0045cd357290dmr22739vsn.14.1700755038864; Thu, 23 Nov 2023 07:57:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700755038; cv=none; d=google.com; s=arc-20160816; b=t0e5sYZA+7el8rJY3fFZJdy0kkZymtSZhh6z1BE6EB9CiSDOTwSOlEKMk6eULXkVyl ZMiY+eMwc9cfYxcxEamlqZnt3ufT9TcUvFSF5wrMgzkdRtkzBGhsLcqQ4SIBfD1df3YG gY9U7pou3dTV457gvPtPTfFPaVd45IdMAMzq0quan4KKZWEr2q4YS13YPCTJxzeRNDNa ng8ASvr/Hd/WZdy6/1rfJd8zAHB1MmnM91Jlf8firOe1xatf80O09R0vEkPh2kGvc7CL 3zI5mN855NNS0f1eBNNzmOd9qwJ9obHwiTcr2FiZ8YMj13DKJRLsW9E9j2uJy/BzLeNm /iIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7M+oTcAeMXRnbjDiygDHIJbp/3rbPEBUV8gBwI47k78=; fh=Bj4dpkZg/oJC6uP+lDImNXEF5DtxNSrp1nmnPpEXHPk=; b=Z8LdUVlUbKvPrMco6tCAp1r5q/Evm1w96B55JNPwy5MoLVXBvc3d0QYdreBtBjCg+9 Owg2kwh4L1OHHBfI6mskUwAYtvtgHLLa1EunG1B2wLl2RThO1O7rWqHSWkxWexmFHCUl dT9FcJR/3LYiw87NwTREAXQlvM0IVVMz7zS6v9CMPygPMTTq3ylOPejNorW3SfCAPhc0 D+qoIzHuzxazHHEzecIDkVD9Ui2Hq7NE1gyNhCK9eO/labZ7OXHS5HsvkMyK0mWbi924 UQ/tLUOr6xg/tqFooEBoD/lgUA8vRiktUzDHidl9Kn6bgHgcGu2okhT+inbKfz9DhqyI gRew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=McGWPbEb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bd15-20020ad4568f000000b0067a0500e75dsi1356243qvb.503.2023.11.23.07.57.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 Nov 2023 07:57:18 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=McGWPbEb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6C49-0005zQ-DR; Thu, 23 Nov 2023 10:56:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6C45-0005xQ-Bs for qemu-devel@nongnu.org; Thu, 23 Nov 2023 10:56:29 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r6C3z-0002Jv-SF for qemu-devel@nongnu.org; Thu, 23 Nov 2023 10:56:29 -0500 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-332ddd8e0bdso475993f8f.0 for ; Thu, 23 Nov 2023 07:56:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700754982; x=1701359782; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7M+oTcAeMXRnbjDiygDHIJbp/3rbPEBUV8gBwI47k78=; b=McGWPbEbQ1CBYMNAxTKREq3viitX4CVeDHR/psDZoL6TP8RX6+llmW2h7eOQaAsw4S Dg5HEO9ZTcYAPY2b5XfgyHWbTli1BO0XuDc5fTRuNJ6cH/tqCQ1XtqNzQfccR25SpI2n b6faUqV8EFLrPWW8GVXVQv3RDb2SxGRKfMJHZqOJJMu3qQrb3ej9LY9Jm3zJqZkeSLFI gzUhuzKu4AlhO7ppHmgtv2c95HZdpl7V7kAi2pY/3Kgx0SYDP3FA2A+3auXuNBNlxein pxR6TcyJz9Xla1JLF2hsI391xvdvnbHw1dd8/DPgyn5xLkdGmGLlKGhkLEZ3YGrMJrau RPuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700754982; x=1701359782; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7M+oTcAeMXRnbjDiygDHIJbp/3rbPEBUV8gBwI47k78=; b=elkQl1uprl8w18E2eIbJeX894SggViY5BAgQJfj7sXCI6WS4dmaAouBLO2WWr7e3nX NpZYM8Xd8JGXEygCpEifj/ibOeL+hacM28mQIDAgP7tICi3gwDO1ffZDlXF64h2j13/U 7CoTcr5BpX4ZOgVDbvOaP0onTyIhcDkO7yyajTcpFpf5kzGVt+u51vlEyhwX/wjgKePP wr5RTSpsW6dAgi7Prb69OunAki8qAUljSZNcyB729aPiRZ+fJH5It9uka2QJ7YIpUk6C X6bN+2YwzuQJjN7/Ukv8DV2wJ6asSxLC5ATMi0nQhtzK2NiRiXJqUjtEzUuHzISs/68l 2oGg== X-Gm-Message-State: AOJu0Yy7vHFDVqwztBVgYuwq/ki29AjtFbewCH6ERbBgP0s8AApY6g1x 5FX0tdEv/KXUZ2RZGxQtuV0Z0A== X-Received: by 2002:a5d:67c5:0:b0:331:34b0:d7b3 with SMTP id n5-20020a5d67c5000000b0033134b0d7b3mr2702062wrw.15.1700754981921; Thu, 23 Nov 2023 07:56:21 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id x13-20020a5d60cd000000b00332d2a9541esm1955409wrt.71.2023.11.23.07.56.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 07:56:21 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 24365645F9; Thu, 23 Nov 2023 15:56:21 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Greg Manning , =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Alexandre Iooss , Mahmoud Mandour Subject: [PULL 04/14] plugins: fix win plugin tests on cross compile Date: Thu, 23 Nov 2023 15:56:10 +0000 Message-Id: <20231123155620.3042891-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231123155620.3042891-1-alex.bennee@linaro.org> References: <20231123155620.3042891-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Greg Manning Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1972 Cross compile gcc is more picky about argument order than msys. Changed the meson command to take the (now renamed) libqemu_plugin_api.a as a lib, rather than an object. This puts it in the right place on both native and cross compile gcc commands Reenable plugins on crossbuilds Signed-off-by: Greg Manning Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20231109124326.21106-2-gmanning@rapitasystems.com> Signed-off-by: Alex Bennée Message-Id: <20231120150833.2552739-5-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index c2af6c7f44..d19d98cde0 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -165,7 +165,7 @@ cross-win32-system: job: win32-fedora-cross-container variables: IMAGE: fedora-win32-cross - EXTRA_CONFIGURE_OPTS: --enable-fdt=internal --disable-plugins + EXTRA_CONFIGURE_OPTS: --enable-fdt=internal CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu microblazeel-softmmu mips64el-softmmu nios2-softmmu artifacts: diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile index 1783750cf6..0b64d2c1e3 100644 --- a/contrib/plugins/Makefile +++ b/contrib/plugins/Makefile @@ -49,7 +49,7 @@ all: $(SONAMES) $(CC) $(CFLAGS) $(PLUGIN_CFLAGS) -c -o $@ $< ifeq ($(CONFIG_WIN32),y) -lib%$(SO_SUFFIX): %.o win32_linker.o ../../plugins/qemu_plugin_api.lib +lib%$(SO_SUFFIX): %.o win32_linker.o ../../plugins/libqemu_plugin_api.a $(CC) -shared -o $@ $^ $(LDLIBS) else ifeq ($(CONFIG_DARWIN),y) lib%$(SO_SUFFIX): %.o diff --git a/plugins/meson.build b/plugins/meson.build index 40d24529c0..6b2d7a9292 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -28,7 +28,7 @@ if get_option('plugins') # then use dlltool to assemble a delaylib. win32_qemu_plugin_api_lib = configure_file( input: win32_plugin_def, - output: 'qemu_plugin_api.lib', + output: 'libqemu_plugin_api.a', command: [dlltool, '--input-def', '@INPUT@', '--output-delaylib', '@OUTPUT@', '--dllname', 'qemu.exe'] ) diff --git a/tests/plugin/meson.build b/tests/plugin/meson.build index 528bb9d86c..28a929dbcc 100644 --- a/tests/plugin/meson.build +++ b/tests/plugin/meson.build @@ -4,7 +4,8 @@ if get_option('plugins') if targetos == 'windows' t += shared_module(i, files(i + '.c') + '../../contrib/plugins/win32_linker.c', include_directories: '../../include/qemu', - objects: [win32_qemu_plugin_api_lib], + link_depends: [win32_qemu_plugin_api_lib], + link_args: ['-Lplugins', '-lqemu_plugin_api'], dependencies: glib) else