Module Name: src
Committed By: joerg
Date: Tue Aug 2 17:22:51 UTC 2011
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64
src/sys/modules/compat_linux32: Makefile
src/sys/modules/compat_netbsd32: Makefile
Log Message:
Remove a number of now unnecessary -no-integrated-as cases.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/amd64/conf/Makefile.amd64
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/compat_linux32/Makefile
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/compat_netbsd32/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.37 src/sys/arch/amd64/conf/Makefile.amd64:1.38
--- src/sys/arch/amd64/conf/Makefile.amd64:1.37 Fri Jun 10 03:18:27 2011
+++ src/sys/arch/amd64/conf/Makefile.amd64 Tue Aug 2 17:22:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.37 2011/06/10 03:18:27 joerg Exp $
+# $NetBSD: Makefile.amd64,v 1.38 2011/08/02 17:22:51 joerg Exp $
# Makefile for NetBSD
#
@@ -65,8 +65,6 @@
AFLAGS.locore.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
AFLAGS.mptramp.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-AFLAGS.linux32_sigcode.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-AFLAGS.netbsd32_sigcode.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
AFLAGS.spl.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
CWARNFLAGS.ah_regdomain.c= ${${ACTIVE_CC} == "clang":?-Wno-error:}
Index: src/sys/modules/compat_linux32/Makefile
diff -u src/sys/modules/compat_linux32/Makefile:1.6 src/sys/modules/compat_linux32/Makefile:1.7
--- src/sys/modules/compat_linux32/Makefile:1.6 Fri May 20 13:11:40 2011
+++ src/sys/modules/compat_linux32/Makefile Tue Aug 2 17:22:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/05/20 13:11:40 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2011/08/02 17:22:51 joerg Exp $
.include "../Makefile.inc"
.include "../Makefile.assym"
@@ -8,8 +8,6 @@
CPPFLAGS+= -DSYSVSHM -DSYSVSEM -DSYSVMSG -DCOMPAT_LINUX
CPPFLAGS+= -DCOMPAT_LINUX32 -DCOMPAT_NETBSD32
-COPTS.linux32_sigcode.S+= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-
.PATH: ${S}/compat/linux32/common
SRCS+= linux32_dirent.c linux32_exec.c linux32_exec_elf32.c linux32_fcntl.c
SRCS+= linux32_ioctl.c linux32_misc.c linux32_mman.c
Index: src/sys/modules/compat_netbsd32/Makefile
diff -u src/sys/modules/compat_netbsd32/Makefile:1.6 src/sys/modules/compat_netbsd32/Makefile:1.7
--- src/sys/modules/compat_netbsd32/Makefile:1.6 Fri May 20 13:08:07 2011
+++ src/sys/modules/compat_netbsd32/Makefile Tue Aug 2 17:22:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/05/20 13:08:07 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2011/08/02 17:22:51 joerg Exp $
.include "../Makefile.inc"
.include "../Makefile.assym"
@@ -9,8 +9,6 @@
CPPFLAGS+= -DEXEC_ELF32 -DEXEC_ELF64 -DEXEC_AOUT
CPPFLAGS+= -DP1003_1B_SEMAPHORE -DCOREDUMP -DKERN_SA
-COPTS.netbsd32_sigcode.S+= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-
.PATH: ${S}/compat/netbsd32
SRCS+= netbsd32_compat_09.c netbsd32_compat_10.c
SRCS+= netbsd32_compat_12.c netbsd32_compat_13.c
