devel/libvex: Add missing C++ files; Remove debug flag; Add arch-spec…

…ific define

devel/libvex/Makefile

@@ -1,5 +1,6 @@
 PORTNAME=	libvex
 DISTVERSION=	g20230201
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -20,6 +21,8 @@ WRKSRC_SUBDIR=	VEX
 
 MAKEFILE=	Makefile-gcc
 
+CFLAGS+=	-DVGA_${ARCH:S/i386/x86/:S/aarch64/arm/:S/powerpc64/ppc64le/:S/powerpc/ppc32/:S/mips/mips64/}
+
 MAKE_ARGS=	EXTRA_CFLAGS="${CFLAGS}"
 
 do-install:

devel/libvex/files/patch-Makefile-gcc

@@ -0,0 +1,30 @@
+--- Makefile-gcc.orig	2023-02-01 10:16:51 UTC
++++ Makefile-gcc
+@@ -68,6 +68,7 @@ LIB_OBJS = 	priv/ir_defs.o                          \
+ 		priv/host_generic_simd128.o	        \
+ 		priv/host_generic_simd256.o	        \
+ 		priv/host_generic_reg_alloc2.o		\
++		priv/host_generic_reg_alloc3.o		\
+ 		priv/guest_generic_x87.o	        \
+ 		priv/guest_generic_bb_to_IR.o		\
+ 		priv/guest_x86_helpers.o		\
+@@ -107,7 +108,7 @@ CCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototyp
+ 		-Wpointer-arith -Wbad-function-cast -Wcast-qual \
+ 		-Wcast-align -Wmissing-declarations \
+ 		-Wwrite-strings -Wformat -Wformat-security \
+-		$(EXTRA_CFLAGS) -g -O2 -fstrict-aliasing
++		$(EXTRA_CFLAGS) -O2 -fstrict-aliasing
+
+ #CC = icc
+ #CCFLAGS = -g -Wall -wd981 -wd279 -wd1287 -wd869 -wd111 -wd188 -wd186
+@@ -346,6 +347,10 @@ priv/host_generic_simd256.o: $(ALL_HEADERS) priv/host_
+ priv/host_generic_reg_alloc2.o: $(ALL_HEADERS) priv/host_generic_reg_alloc2.c
+ 	$(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host_generic_reg_alloc2.o \
+ 					 -c priv/host_generic_reg_alloc2.c
++
++priv/host_generic_reg_alloc3.o: $(ALL_HEADERS) priv/host_generic_reg_alloc3.c
++	$(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host_generic_reg_alloc3.o \
++					 -c priv/host_generic_reg_alloc3.c
+
+ priv/guest_x86_toIR.o: $(ALL_HEADERS) priv/guest_x86_toIR.c
+ 	$(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest_x86_toIR.o \