Module Name:    src
Committed By:   jnemeth
Date:           Thu Sep 17 23:07:13 UTC 2009

Modified Files:
        src/sys/modules/exec_elf32: Makefile
        src/sys/modules/exec_elf64: Makefile

Log Message:
Not all platforms can do PaX stuff.  The list was derived in private
conversation with several developers.  The change was tested on
sparc64.

NetBSD ultra.example.ca 5.99.17 NetBSD 5.99.17 (MODULAR) #0: Tue Sep 15 
19:08:02 PDT 2009  
jnem...@ultra.example.ca:/usr/local/current/objdir/sys/arch/sparc64/compile/MODULAR
 sparc64

NAME            CLASS   SOURCE  REFS    SIZE    REQUIRES
...
exec_elf64      misc    filesys 0       6981    coredump
...


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/exec_elf32/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/exec_elf64/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/modules/exec_elf32/Makefile
diff -u src/sys/modules/exec_elf32/Makefile:1.1 src/sys/modules/exec_elf32/Makefile:1.2
--- src/sys/modules/exec_elf32/Makefile:1.1	Wed Nov 19 18:36:08 2008
+++ src/sys/modules/exec_elf32/Makefile	Thu Sep 17 23:07:12 2009
@@ -1,10 +1,20 @@
-#	$NetBSD: Makefile,v 1.1 2008/11/19 18:36:08 ad Exp $
+#	$NetBSD: Makefile,v 1.2 2009/09/17 23:07:12 jnemeth Exp $
 
 .include "../Makefile.inc"
 
 KMOD=	exec_elf32
 
-CPPFLAGS+=	-DEXEC_ELF32 -DPAX_ASLR -DCOREDUMP
+CPPFLAGS+=	-DEXEC_ELF32 -DCOREDUMP
+.if ${MACHINE_ARCH} != "arm" && \
+    ${MACHINE_ARCH} != "armeb" && \
+    ${MACHINE_ARCH} != "m68000" && \
+    ${MACHINE_ARCH} != "m68k" && \
+    ${MACHINE_ARCH} != "powerpc" && \
+    ${MACHINE_ARCH} != "powerpc64" && \
+    ${MACHINE_ARCH} != "sparc" && \
+    ${MACHINE_ARCH} != "sparc64"
+CPPFLAGS+=	-DPAX_ASLR
+.endif
 
 .PATH:	${S}/kern
 SRCS=	exec_elf32.c core_elf32.c

Index: src/sys/modules/exec_elf64/Makefile
diff -u src/sys/modules/exec_elf64/Makefile:1.1 src/sys/modules/exec_elf64/Makefile:1.2
--- src/sys/modules/exec_elf64/Makefile:1.1	Wed Nov 19 18:36:08 2008
+++ src/sys/modules/exec_elf64/Makefile	Thu Sep 17 23:07:12 2009
@@ -1,10 +1,14 @@
-#	$NetBSD: Makefile,v 1.1 2008/11/19 18:36:08 ad Exp $
+#	$NetBSD: Makefile,v 1.2 2009/09/17 23:07:12 jnemeth Exp $
 
 .include "../Makefile.inc"
 
 KMOD=	exec_elf64
 
-CPPFLAGS+=	-DEXEC_ELF64 -DPAX_ASLR -DCOREDUMP
+CPPFLAGS+=	-DEXEC_ELF64 -DCOREDUMP
+.if ${MACHINE_ARCH} != "powerpc64" && \
+    ${MACHINE_ARCH} != "sparc64"
+CPPFLAGS+=	-DPAX_ASLR
+.endif
 
 .PATH:	${S}/kern
 SRCS=	exec_elf64.c core_elf64.c

Reply via email to