From e0b727dfd026d9698d39e4ee9d473d6d1dfaadba Mon Sep 17 00:00:00 2001 From: mlarkin Date: Tue, 30 May 2017 12:41:55 +0000 Subject: [PATCH] move some data tables out of .text and into .rodata where they belong ok deraadt --- sys/arch/amd64/amd64/vector.S | 5 +++-- sys/arch/i386/i386/vector.s | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/arch/amd64/amd64/vector.S b/sys/arch/amd64/amd64/vector.S index 96f8ff34241..d2f4f4bebf9 100644 --- a/sys/arch/amd64/amd64/vector.S +++ b/sys/arch/amd64/amd64/vector.S @@ -1,4 +1,4 @@ -/* $OpenBSD: vector.S,v 1.47 2016/09/04 09:22:28 mpi Exp $ */ +/* $OpenBSD: vector.S,v 1.48 2017/05/30 12:41:55 mlarkin Exp $ */ /* $NetBSD: vector.S,v 1.5 2004/06/28 09:13:11 fvdl Exp $ */ /* @@ -778,6 +778,8 @@ INTRSTUB(ioapic_level,63,voidop,ioapic_asm_ack,voidop,ioapic_unmask,ioapic_mask) #endif + .section .rodata + .globl _C_LABEL(i8259_stubs) _C_LABEL(i8259_stubs): .quad _C_LABEL(Xintr_legacy0), _C_LABEL(Xrecurse_legacy0) @@ -1077,7 +1079,6 @@ _C_LABEL(ioapic_level_stubs): .quad _C_LABEL(Xresume_ioapic_level63) #endif - .data /* * Soft interrupt handlers */ diff --git a/sys/arch/i386/i386/vector.s b/sys/arch/i386/i386/vector.s index 7ed63cf7fbe..6b2609a38d7 100644 --- a/sys/arch/i386/i386/vector.s +++ b/sys/arch/i386/i386/vector.s @@ -1,4 +1,4 @@ -/* $OpenBSD: vector.s,v 1.20 2015/06/28 01:11:27 guenther Exp $ */ +/* $OpenBSD: vector.s,v 1.21 2017/05/30 12:41:55 mlarkin Exp $ */ /* $NetBSD: vector.s,v 1.32 1996/01/07 21:29:47 mycroft Exp $ */ /* @@ -199,6 +199,7 @@ INTRSTUB(legacy,14, i8259_asm_ack2, voidop, i8259_asm_mask, i8259_asm_unmask, INTRSTUB(legacy,15, i8259_asm_ack2, voidop, i8259_asm_mask, i8259_asm_unmask, voidop) + .section .rodata /* * These tables are used by the ISA configuration code. */ -- 2.20.1