Module Name: src
Committed By: maya
Date: Wed Feb 22 12:17:16 UTC 2017
Modified Files:
src/doc: HACKS
src/external/bsd/libevent/lib/libevent: Makefile
src/sys/rump/net/lib/libnetbt: Makefile
src/usr.sbin/racoon: Makefile
Log Message:
GC some GCC 4.8 specific sh3 HACKS entries.
These existed to avoid compile errors, and haven't been effect
since gcc.old was removed.
To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 src/doc/HACKS
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libevent/lib/libevent/Makefile
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/net/lib/libnetbt/Makefile
cvs rdiff -u -r1.28 -r1.29 src/usr.sbin/racoon/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/HACKS
diff -u src/doc/HACKS:1.184 src/doc/HACKS:1.185
--- src/doc/HACKS:1.184 Thu Feb 16 01:05:01 2017
+++ src/doc/HACKS Wed Feb 22 12:17:16 2017
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.184 2017/02/16 01:05:01 rin Exp $
+# $NetBSD: HACKS,v 1.185 2017/02/22 12:17:16 maya Exp $
#
# This file is intended to document workarounds for currently unsolved
# (mostly) compiler bugs.
@@ -644,47 +644,6 @@ port sh3
-fno-loop-optimize.
kcah
-port sh3eb
- hack gcc4.8.1
- cdate Thu Nov 7 16:31:23 EST 2013
- who christos
- file src/sys/rump/net/lib/libnetbt/Makefile : 1.2
- desrc
- for profiling
- compile l2cap_signal.c with -O0 to avoid:
- ./netbt/l2cap_signal.c:36:
- /p/netbsd/cvsroot/src/sys/rump/net/lib/libnetbt/../../../../\
- netbt/l2cap_signal.c: In function 'l2cap_recv_signal':
- ./sh3/byte_swap.h:20:2: error: 'asm' operand requires \
- impossible reload
- __asm volatile ("swap.b %1,%0" : "=r"(rval) : "r"(x));
- kcah
-
-port sh3el
- hack gcc4.8.1
- cdate Fri Nov 8 19:27:01 EST 2013
- who christos
- file src/external/bsd/libevent/lib/libevent/Makefile : 1.2
- desrc
- for profiling
- compile evdns.c with -O0 to avoid:
- ./sh3/byte_swap.h:20:2: error: 'asm' operand requires \
- impossible reload
- __asm volatile ("swap.b %1,%0" : "=r"(rval) : "r"(x));
- kcah
-
- hack gcc4.8.1
- cdate Fri Nov 8 19:34:48 EST 2013
- who christos
- file src/usr.sbin/racoon/Makefile : 1.27
- desrc
- for profiling
- compile ipsec_doi.c with -O0 to avoid:
- ./sh3/byte_swap.h:20:2: error: 'asm' operand requires \
- impossible reload
- __asm volatile ("swap.b %1,%0" : "=r"(rval) : "r"(x));
- kcah
-
port m68000
hack gcc4-m68000
Index: src/external/bsd/libevent/lib/libevent/Makefile
diff -u src/external/bsd/libevent/lib/libevent/Makefile:1.3 src/external/bsd/libevent/lib/libevent/Makefile:1.4
--- src/external/bsd/libevent/lib/libevent/Makefile:1.3 Tue Jan 31 23:17:40 2017
+++ src/external/bsd/libevent/lib/libevent/Makefile Wed Feb 22 12:17:16 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/01/31 23:17:40 christos Exp $
+# $NetBSD: Makefile,v 1.4 2017/02/22 12:17:16 maya Exp $
USE_SHLIBDIR=yes
.include <bsd.own.mk>
@@ -29,10 +29,4 @@ poll.c \
select.c \
signal.c
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 48
-.if ${MACHINE_ARCH} == "sh3el"
-COPTS.evdns.c= -O0
-.endif
-.endif
-
.include <bsd.lib.mk>
Index: src/sys/rump/net/lib/libnetbt/Makefile
diff -u src/sys/rump/net/lib/libnetbt/Makefile:1.6 src/sys/rump/net/lib/libnetbt/Makefile:1.7
--- src/sys/rump/net/lib/libnetbt/Makefile:1.6 Mon Oct 19 16:16:38 2015
+++ src/sys/rump/net/lib/libnetbt/Makefile Wed Feb 22 12:17:16 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/10/19 16:16:38 pooka Exp $
+# $NetBSD: Makefile,v 1.7 2017/02/22 12:17:16 maya Exp $
#
NOLINT= #defined
@@ -18,11 +18,6 @@ SRCS= bt_proto.c bt_sysctl.c \
rfcomm_dlc.c rfcomm_session.c rfcomm_socket.c rfcomm_upper.c \
sco_socket.c sco_upper.c
-.if ${HAVE_GCC:U} == "48"
-.if ${MACHINE_ARCH} == "sh3eb" || ${MACHINE_ARCH} == "sh3el"
-COPTS.l2cap_signal.c= -O0
-.endif
-.endif
SRCS+= netbt_component.c
.include <bsd.lib.mk>
Index: src/usr.sbin/racoon/Makefile
diff -u src/usr.sbin/racoon/Makefile:1.28 src/usr.sbin/racoon/Makefile:1.29
--- src/usr.sbin/racoon/Makefile:1.28 Sat Jan 28 23:42:36 2017
+++ src/usr.sbin/racoon/Makefile Wed Feb 22 12:17:16 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2017/01/28 23:42:36 christos Exp $
+# $NetBSD: Makefile,v 1.29 2017/02/22 12:17:16 maya Exp $
WARNS?= 0 # XXX third-party program, many issues
NOCLANGERROR= # defined
@@ -72,9 +72,4 @@ prsa_tok.c: ${DIST}/src/racoon/prsa_tok.
prsa_par.c: ${DIST}/src/racoon/prsa_par.y
${YACC} -pprsa -d -o ${.TARGET} ${.ALLSRC}
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 48
-.if ${MACHINE_ARCH} == "sh3el"
-COPTS.ipsec_doi.c= -O0
-.endif
-.endif
.include <bsd.prog.mk>
