From 1e959ba39674f73ba0691ec2a77d151baeb3381e Mon Sep 17 00:00:00 2001 From: Stan Cox Date: Wed, 8 Jul 2009 16:30:15 -0400 Subject: Do not use GPL for sdt.h. --- includes/sys/sdt.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'includes/sys/sdt.h') diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h index 07ece7c1..e12b1482 100644 --- a/includes/sys/sdt.h +++ b/includes/sys/sdt.h @@ -1,10 +1,6 @@ /* Copyright (C) 2005-2009 Red Hat Inc. - Copyright (C) 2006 Intel Corporation. - This file is part of systemtap, and is free software. You can - redistribute it and/or modify it under the terms of the GNU General - Public License (GPL); either version 2, or (at your option) any - later version. + This file is part of systemtap, and is free software. */ #ifndef _SYS_SDT_H -- cgit From b4fbb579fdd73eb1e61784ffa8c9ba02f89f8e26 Mon Sep 17 00:00:00 2001 From: Stan Cox Date: Wed, 8 Jul 2009 17:05:27 -0400 Subject: Clarify sdt.h license for public domain. --- includes/sys/sdt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'includes/sys/sdt.h') diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h index e12b1482..e448c90e 100644 --- a/includes/sys/sdt.h +++ b/includes/sys/sdt.h @@ -1,6 +1,6 @@ /* Copyright (C) 2005-2009 Red Hat Inc. - This file is part of systemtap, and is free software. + This file is part of systemtap, and is free software in the public domain. */ #ifndef _SYS_SDT_H -- cgit From 880fc23fa180ae9c9557e7ff945f5f1e750aef15 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 10 Jul 2009 13:53:00 +0200 Subject: PR10381 sdt.h macros create relocatable addresses in non-writable section. Allocated section needs to be writable when creating pic shared objects because we store relocatable addresses in them. * includes/sys/sdt.h (ALLOCSEC): New macro, depends on __PIC__. (STAP_PROBE_DATA_): Use new ALLOCSEC macro. --- includes/sys/sdt.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'includes/sys/sdt.h') diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h index e448c90e..3b788b88 100644 --- a/includes/sys/sdt.h +++ b/includes/sys/sdt.h @@ -17,9 +17,17 @@ #define STAP_PROBE_ADDR "\t.long " #endif +/* Allocated section needs to be writable when creating pic shared objects + because we store relocatable addresses in them. */ +#ifdef __PIC__ +#define ALLOCSEC "\"aw\"" +#else +#define ALLOCSEC "\"a\"" +#endif + /* An allocated section .probes that holds the probe names and addrs. */ #define STAP_PROBE_DATA_(probe,guard,arg) \ - __asm__ volatile (".section .probes, \"a\"\n" \ + __asm__ volatile (".section .probes," ALLOCSEC "\n" \ "\t.align 8\n" \ "1:\n\t.asciz " #probe "\n" \ "\t.align 4\n" \ -- cgit