On Fri, Aug 07, 2020 at 05:00:53AM -0400, Brad Smith wrote:
> 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.
it does seem that all of those -march=i686 cases are for atomics
your diff minus the original now committed changes:
Index: graphics/darktable/Makefile
===================================================================
RCS file: /cvs/ports/graphics/darktable/Makefile,v
retrieving revision 1.97
diff -u -p -r1.97 Makefile
--- graphics/darktable/Makefile 14 May 2020 12:35:31 -0000 1.97
+++ graphics/darktable/Makefile 7 Aug 2020 09:26:26 -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: graphics/openimageio/Makefile
===================================================================
RCS file: /cvs/ports/graphics/openimageio/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- graphics/openimageio/Makefile 14 May 2020 12:35:31 -0000 1.41
+++ graphics/openimageio/Makefile 7 Aug 2020 09:26:26 -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: www/webkitgtk4/Makefile
===================================================================
RCS file: /cvs/ports/www/webkitgtk4/Makefile,v
retrieving revision 1.124
diff -u -p -r1.124 Makefile
--- www/webkitgtk4/Makefile 29 Jul 2020 07:06:41 -0000 1.124
+++ www/webkitgtk4/Makefile 7 Aug 2020 09:26:26 -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/gnome/photos/Makefile
===================================================================
RCS file: /cvs/ports/x11/gnome/photos/Makefile,v
retrieving revision 1.81
diff -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 09:26:26 -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}
Index: x11/qt5/qtwebkit/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
retrieving revision 1.25
diff -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 09:26:26 -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:
