[Buildroot] [PATCH 1/1] package/xvisor: fix build with gcc 11

Fri Sep 3 19:17:05 UTC 2021

On 02/09/2021 18:41, Fabrice Fontaine wrote:
> Fix the following build failures with gcc 11:
> 
> /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/build/drivers/drivers.o: in function `psmouse_extensions':
> /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `lifebook_detect'
> /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `alps_detect'
> /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `ps2pp_init'
> /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `trackpoint_detect'
> /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `fsp_detect'
> 

 It took me a bit of puzzling to find out why this was GCC 11 specific. I'm not
100% sure, but I think it's that GCC 11 changed the inline keyword behaviour
again. It's not the "extern inline" thing because that would possibly trigger
multiple defined symbols, not undefined symbols...

> Fixes:
>  - http://autobuild.buildroot.org/results/69062b9c80567d135edd48890165e69881cf7295
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> ---
>  ...psmouse-back.c-fix-build-with-gcc-11.patch | 95 +++++++++++++++++++
>  1 file changed, 95 insertions(+)
>  create mode 100644 package/xvisor/0002-psmouse-back.c-fix-build-with-gcc-11.patch
> 
> diff --git a/package/xvisor/0002-psmouse-back.c-fix-build-with-gcc-11.patch b/package/xvisor/0002-psmouse-back.c-fix-build-with-gcc-11.patch
> new file mode 100644
> index 0000000000..fdd75a6483
> --- /dev/null
> +++ b/package/xvisor/0002-psmouse-back.c-fix-build-with-gcc-11.patch
> @@ -0,0 +1,95 @@
> +From 9dc69a4ea899d2f982085ad727bcc92c4496c3ec Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> +Date: Thu, 2 Sep 2021 18:13:03 +0200
> +Subject: [PATCH] psmouse-back.c: fix build with gcc 11
> +
> +Fix the following build failures with gcc 11:
> +
> +/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/build/drivers/drivers.o: in function `psmouse_extensions':
> +/home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `lifebook_detect'
> +/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `alps_detect'
> +/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `ps2pp_init'
> +/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `trackpoint_detect'
> +/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `fsp_detect'
> +
> +Fixes:
> + - http://autobuild.buildroot.org/results/69062b9c80567d135edd48890165e69881cf7295
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> +[Upstream status: not sent (no answer on first patch)]

 Doesn't hurt to send it anyway, right?

> +---
> + drivers/input/mouse/psmouse-base.c | 10 ++++++++++
> + 1 file changed, 10 insertions(+)
> +
> +diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
> +index 23956442..c6f740f7 100644
> +--- a/drivers/input/mouse/psmouse-base.c
> ++++ b/drivers/input/mouse/psmouse-base.c
> +@@ -719,6 +719,7 @@ static int psmouse_extensions(struct psmouse *psmouse,
> + {
> + 	bool synaptics_hardware = false;
> + 
> ++#ifdef CONFIG_MOUSE_PS2_LIFEBOOK
> + /*
> +  * We always check for lifebook because it does not disturb mouse
> +  * (it only checks DMI information).
> +@@ -729,6 +730,7 @@ static int psmouse_extensions(struct psmouse *psmouse,
> + 				return PSMOUSE_LIFEBOOK;
> + 		}
> + 	}
> ++#endif
> + 
> + /*
> +  * Try Kensington ThinkingMouse (we try first, because synaptics probe
> +@@ -772,6 +774,7 @@ static int psmouse_extensions(struct psmouse *psmouse,
> + 		synaptics_reset(psmouse);
> + 	}
> + 
> ++#ifdef CONFIG_MOUSE_PS2_ALPS
> + /*
> +  * Try ALPS TouchPad
> +  */
> +@@ -787,6 +790,7 @@ static int psmouse_extensions(struct psmouse *psmouse,
> + 			max_proto = PSMOUSE_IMEX;
> + 		}
> + 	}
> ++#endif
> + 
> + /*
> +  * Try OLPC HGPK touchpad.
> +@@ -819,19 +823,24 @@ static int psmouse_extensions(struct psmouse *psmouse,
> + 				      psmouse, set_properties) == 0)
> + 			return PSMOUSE_GENPS;
> + 
> ++#ifdef CONFIG_MOUSE_PS2_LOGIPS2PP
> + 		if (psmouse_do_detect(ps2pp_init,

 This is not actually the proper solution. Instead, the ps2pp_init (and all
other functions) should be declared static inline instead of plain inline in the
header file.

 Regards,
 Arnout

> + 				      psmouse, set_properties) == 0)
> + 			return PSMOUSE_PS2PP;
> ++#endif
> + 
> ++#ifdef CONFIG_MOUSE_PS2_TRACKPOINT
> + 		if (psmouse_do_detect(trackpoint_detect,
> + 				      psmouse, set_properties) == 0)
> + 			return PSMOUSE_TRACKPOINT;
> ++#endif
> + 
> + 		if (psmouse_do_detect(touchkit_ps2_detect,
> + 				      psmouse, set_properties) == 0)
> + 			return PSMOUSE_TOUCHKIT_PS2;
> + 	}
> + 
> ++#ifdef CONFIG_MOUSE_PS2_SENTELIC
> + /*
> +  * Try Finger Sensing Pad. We do it here because its probe upsets
> +  * Trackpoint devices (causing TP_READ_ID command to time out).
> +@@ -847,6 +856,7 @@ static int psmouse_extensions(struct psmouse *psmouse,
> + 			max_proto = PSMOUSE_IMEX;
> + 		}
> + 	}
> ++#endif
> + 
> + /*
> +  * Reset to defaults in case the device got confused by extended
> +-- 
> +2.32.0
> +
> 