On Fri, Aug 07, 2020 at 05:36:19PM +1000, Jonathan Gray wrote:
> -march=i586 is now the default for clang in base on i386
There were a few other spots with -march adjustments for atomics.
Index: net/dnsdist/Makefile
===================================================================
RCS file: /home/cvs/ports/net/dnsdist/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- net/dnsdist/Makefile 30 Jul 2020 14:25:11 -0000 1.18
+++ net/dnsdist/Makefile 7 Aug 2020 02:57:37 -0000
@@ -54,12 +54,6 @@ LIB_DEPENDS+= ${MODLUA_LIB_DEPENDS} \
net/libfstrm \
www/h2o
-.if ${MACHINE_ARCH:Mi386}
-# needs 64-bit atomics
-CFLAGS+= -march=i586
-CXXFLAGS+= -march=i586
-.endif
-
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/{doc,examples}/dnsdist
cd ${WRKSRC}; ${INSTALL_DATA} README.md ${PREFIX}/share/doc/dnsdist/; \
Index: net/knot/Makefile
===================================================================
RCS file: /home/cvs/ports/net/knot/Makefile,v
retrieving revision 1.50
diff -u -p -u -p -r1.50 Makefile
--- net/knot/Makefile 19 Jun 2020 16:39:00 -0000 1.50
+++ net/knot/Makefile 7 Aug 2020 02:58:05 -0000
@@ -48,10 +48,6 @@ CONFIGURE_ENV = ac_cv_path_PDFLATEX="fa
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS += -march=i586
-.endif
-
post-install:
mv ${WRKINST}/etc/knot/ ${PREFIX}/share/examples/knot/
Index: lang/mono/Makefile
===================================================================
RCS file: /home/cvs/ports/lang/mono/Makefile,v
retrieving revision 1.139
diff -u -p -u -p -r1.139 Makefile
--- lang/mono/Makefile 29 Jul 2020 10:50:36 -0000 1.139
+++ lang/mono/Makefile 7 Aug 2020 02:58:24 -0000
@@ -61,10 +61,6 @@ AUTOMAKE_VERSION=1.15
CONFIGURE_ENV= ac_cv_header_execinfo_h=no
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ENV+= CFLAGS="-march=i586"
-.endif
-
CONFIGURE_ARGS= --with-gc=included \
--with-tls=pthread \
--enable-btls \
Index: databases/kyotocabinet/Makefile
===================================================================
RCS file: /home/cvs/ports/databases/kyotocabinet/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- databases/kyotocabinet/Makefile 21 Jul 2020 14:25:36 -0000 1.24
+++ databases/kyotocabinet/Makefile 7 Aug 2020 03:11:58 -0000
@@ -40,11 +40,6 @@ FLAVOR?=
CONFIGURE_ARGS += --enable-opt
.else
CONFIGURE_ARGS += --disable-opt
-# i386 still need some optimized instructions
-# undefined reference to `__sync_bool_compare_and_swap_8' ...
-.if ${MACHINE_ARCH} == "i386"
-CXXFLAGS += -march=i586
-.endif
.endif
pre-configure:
Index: games/0ad/base/Makefile
===================================================================
RCS file: /home/cvs/ports/games/0ad/base/Makefile,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 Makefile
--- games/0ad/base/Makefile 11 Mar 2019 04:11:57 -0000 1.28
+++ games/0ad/base/Makefile 7 Aug 2020 02:58:57 -0000
@@ -63,11 +63,6 @@ CONFIGURE_ARGS += --without-nvtt \
# XXX atlas (the level editor) requires threaded libxml
CONFIGURE_ARGS += --disable-atlas
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS += -march=i586
-CXXFLAGS += -march=i586
-.endif
-
WRKSRC = ${WRKDIST}/build/workspaces/gcc
do-build:
Index: graphics/openimageio/Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/openimageio/Makefile,v
retrieving revision 1.41
diff -u -p -u -p -r1.41 Makefile
--- graphics/openimageio/Makefile 14 May 2020 12:35:31 -0000 1.41
+++ graphics/openimageio/Makefile 7 Aug 2020 03:01:50 -0000
@@ -10,7 +10,7 @@ GH_PROJECT = oiio
V = 1.8.6
GH_TAGNAME = Release-$V
DISTNAME = openimageio-${V}
-REVISION = 7
+REVISION = 8
SHARED_LIBS += OpenImageIO 5.0 # 1.0
SHARED_LIBS += OpenImageIO_Util 2.0 # 1.5
@@ -56,9 +56,7 @@ CONFIGURE_ARGS += -DUSE_OPENCV=OFF \
-DSTOP_ON_WARNING=OFF
CXXFLAGS += -pthread
-.if ${MACHINE_ARCH} == "i386"
-CXXFLAGS += -march=i686
-.endif
+
WRKDIST = ${WRKDIR}/oiio-Release-$V
# Fix undefined reference to __atomic_*
Index: graphics/darktable/Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/darktable/Makefile,v
retrieving revision 1.97
diff -u -p -u -p -r1.97 Makefile
--- graphics/darktable/Makefile 14 May 2020 12:35:31 -0000 1.97
+++ graphics/darktable/Makefile 7 Aug 2020 03:03:12 -0000
@@ -8,7 +8,7 @@ V= 2.6.3
DISTNAME= darktable-$V
PORTROACH= limitw:1,even skipv:release-$V
EXTRACT_SUFX= .tar.xz
-REVISION= 2
+REVISION= 3
CATEGORIES= graphics x11
@@ -72,8 +72,8 @@ NO_TEST= Yes
.include <bsd.port.arch.mk>
.if ${ARCH:Mi386}
-# needs 64-bit atomic ops, and all the registers it can get.
-CFLAGS += -march=i686 -fomit-frame-pointer
+# needs all the registers it can get.
+CFLAGS+= -fomit-frame-pointer
.endif
# ...and there's a hard requirement of SSE3
CFLAGS+= -msse3
Index: multimedia/mpv/Makefile
===================================================================
RCS file: /home/cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.61
diff -u -p -u -p -r1.61 Makefile
--- multimedia/mpv/Makefile 29 Jan 2020 06:52:21 -0000 1.61
+++ multimedia/mpv/Makefile 7 Aug 2020 03:13:32 -0000
@@ -99,10 +99,6 @@ MAKE_FLAGS = -o "${WRKBUILD}" -t "${WRK
NO_TEST = Yes
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS += -march=i586
-.endif
-
DO_WAF = cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MODPY_BIN} \
${WAF} ${MAKE_FLAGS}
Index: www/webkitgtk4/Makefile
===================================================================
RCS file: /home/cvs/ports/www/webkitgtk4/Makefile,v
retrieving revision 1.124
diff -u -p -u -p -r1.124 Makefile
--- www/webkitgtk4/Makefile 29 Jul 2020 07:06:41 -0000 1.124
+++ www/webkitgtk4/Makefile 7 Aug 2020 03:04:41 -0000
@@ -16,6 +16,7 @@ COMMENT = GTK+ port of the WebKit rende
V = 2.28.4
DISTNAME = webkitgtk-${V}
PKGNAME = webkitgtk4-${V}
+REVISION = 0
EXTRACT_SUFX = .tar.xz
API = 4.0
SUBST_VARS = API
@@ -111,12 +112,6 @@ CXXFLAGS += -I${X11BASE}/include
# save memory on 32bit arches
.if !${PROPERTIES:Mlld} && ${MACHINE_ARCH} != "amd64"
LDFLAGS += -Wl,--no-keep-memory
-.endif
-
-# __sync_add_and_fetch_8
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS += -march=i686
-CXXFLAGS += -march=i686
.endif
.if ${MACHINE_ARCH} == "powerpc"
Index: x11/qt5/qtwebkit/Makefile
===================================================================
RCS file: /home/cvs/ports/x11/qt5/qtwebkit/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- x11/qt5/qtwebkit/Makefile 9 Jun 2020 22:43:16 -0000 1.25
+++ x11/qt5/qtwebkit/Makefile 7 Aug 2020 03:07:36 -0000
@@ -14,7 +14,7 @@ PKGNAME = qtwebkit-${VERSION}
PKGSPEC = qtwebkit->=${VERSION}v0
EPOCH= 0
-REVISION = 0
+REVISION = 1
SHARED_LIBS += Qt5WebKit 3.1 # 5.9
@@ -122,12 +122,6 @@ CONFIGURE_ARGS += -DENABLE_LLINT_C_LOOP=
# save memory on 32bit arches
.if !${PROPERTIES:Mlld} && ${MACHINE_ARCH} != "amd64"
LDFLAGS += -Wl,--no-keep-memory
-.endif
-
-# __sync_add_and_fetch_8
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS += -march=i686
-CXXFLAGS += -march=i686
.endif
post-install:
Index: x11/gnome/builder/Makefile
===================================================================
RCS file: /home/cvs/ports/x11/gnome/builder/Makefile,v
retrieving revision 1.104
diff -u -p -u -p -r1.104 Makefile
--- x11/gnome/builder/Makefile 3 Jul 2020 21:13:22 -0000 1.104
+++ x11/gnome/builder/Makefile 7 Aug 2020 08:56:34 -0000
@@ -60,9 +60,7 @@ LIB_DEPENDS= devel/glade \
x11/gtksourceview4
.include <bsd.port.arch.mk>
-.if ${ARCH:Mi386} # needs 64-bit atomic ops
-CFLAGS += -march=i586
-CXXFLAGS += -march=i586
+.if ${ARCH:Mi386}
# Doesn't build with lld: non-ABS relocation R_386_GOTOFF against symbol
'.LC74'
USE_LLD = No
.endif
Index: x11/gnome/photos/Makefile
===================================================================
RCS file: /home/cvs/ports/x11/gnome/photos/Makefile,v
retrieving revision 1.81
diff -u -p -u -p -r1.81 Makefile
--- x11/gnome/photos/Makefile 24 Jun 2020 17:56:43 -0000 1.81
+++ x11/gnome/photos/Makefile 7 Aug 2020 03:05:33 -0000
@@ -4,6 +4,7 @@ COMMENT= access, organize and share you
GNOME_PROJECT= gnome-photos
GNOME_VERSION= 3.34.2
+REVISION= 0
CATEGORIES= graphics
@@ -43,11 +44,6 @@ RUN_DEPENDS += x11/gnome/grilo-plugins
# org.freedesktop.Tracker schema
RUN_DEPENDS += x11/gnome/tracker-miners
-
-.if ${MACHINE_ARCH} == i386
-# undefined reference to `__sync_add_and_fetch_8'
-CFLAGS += -march=i686
-.endif
DEBUG_PACKAGES= ${BUILD_PACKAGES}
