diff options
author | Elliott Hughes <enh@google.com> | 2015-02-18 22:19:45 -0800 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2015-02-18 23:24:43 -0800 |
commit | 03333823c75a1c1887e923828113a1b0fd12020c (patch) | |
tree | a63e40b5dd9927bd04ec7427c8797975c2a71f85 /src/lib/eu-config.h | |
parent | b48bfdc826ebdd316d5d8a4ff8f213391f1c710b (diff) | |
download | android_external_elfutils-03333823c75a1c1887e923828113a1b0fd12020c.tar.gz android_external_elfutils-03333823c75a1c1887e923828113a1b0fd12020c.tar.bz2 android_external_elfutils-03333823c75a1c1887e923828113a1b0fd12020c.zip |
Upgrade to elfutils 0.161.
Change-Id: Iee07e1329d9750f092afc6c2fbd6af8db32862b0
Diffstat (limited to 'src/lib/eu-config.h')
-rw-r--r-- | src/lib/eu-config.h | 64 |
1 files changed, 25 insertions, 39 deletions
diff --git a/src/lib/eu-config.h b/src/lib/eu-config.h index f814604f..3afff26a 100644 --- a/src/lib/eu-config.h +++ b/src/lib/eu-config.h @@ -1,50 +1,30 @@ /* Configuration definitions. Copyright (C) 2008, 2009 Red Hat, Inc. - This file is part of Red Hat elfutils. + This file is part of elfutils. - Red Hat elfutils is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by the - Free Software Foundation; version 2 of the License. + This file is free software; you can redistribute it and/or modify + it under the terms of either - Red Hat elfutils is distributed in the hope that it will be useful, but + * the GNU Lesser General Public License as published by the Free + Software Foundation; either version 3 of the License, or (at + your option) any later version + + or + + * the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at + your option) any later version + + or both in parallel, as here. + + elfutils is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License along - with Red Hat elfutils; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA. - - In addition, as a special exception, Red Hat, Inc. gives You the - additional right to link the code of Red Hat elfutils with code licensed - under an Open Source Initiative certified open source license - (http://www.opensource.org/licenses/index.php) and to distribute linked - combinations including the two. Non-GPL Code permitted under this - exception must only link to the code of Red Hat elfutils through those - well defined interfaces identified in the file named EXCEPTION found in - the source code files (the "Approved Interfaces"). The files of Non-GPL - Code may instantiate templates or use macros or inline functions from - the Approved Interfaces without causing the resulting work to be covered - by the GNU General Public License. Only Red Hat, Inc. may make changes - or additions to the list of Approved Interfaces. Red Hat's grant of - this exception is conditioned upon your not adding any new exceptions. - If you wish to add a new Approved Interface or exception, please contact - Red Hat. You must obey the GNU General Public License in all respects - for all of the Red Hat elfutils code and other code used in conjunction - with Red Hat elfutils except the Non-GPL Code covered by this exception. - If you modify this file, you may extend this exception to your version - of the file, but you are not obligated to do so. If you do not wish to - provide this exception without modification, you must delete this - exception statement from your version and license this file solely under - the GPL without exception. - - Red Hat elfutils is an included package of the Open Invention Network. - An included package of the Open Invention Network is a package for which - Open Invention Network licensees cross-license their patents. No patent - license is granted, either expressly or impliedly, by designation as an - included package. Should you wish to participate in the Open Invention - Network licensing program, please visit www.openinventionnetwork.com - <http://www.openinventionnetwork.com>. */ + You should have received copies of the GNU General Public License and + the GNU Lesser General Public License along with this program. If + not, see <http://www.gnu.org/licenses/>. */ #ifndef EU_CONFIG_H #define EU_CONFIG_H 1 @@ -190,12 +170,18 @@ asm (".section predict_data, \"aw\"; .previous\n" ".symver _compat." #version "." #name "," #name "@" #version); # define NEW_VERSION(name, version) \ asm (".symver " #name "," #name "@@@" #version); +# define COMPAT_VERSION_NEWPROTO(name, version, prefix) \ + asm (".symver _compat." #version "." #name "," #name "@" #version); \ + __typeof (_compat_##prefix##_##name) _compat_##prefix##_##name \ + asm ("_compat." #version "." #name); # define COMPAT_VERSION(name, version, prefix) \ asm (".symver _compat." #version "." #name "," #name "@" #version); \ __typeof (name) _compat_##prefix##_##name asm ("_compat." #version "." #name); #else # define OLD_VERSION(name, version) /* Nothing for static linking. */ # define NEW_VERSION(name, version) /* Nothing for static linking. */ +# define COMPAT_VERSION_NEWPROTO(name, version, prefix) \ + error "should use #ifdef SHARED" # define COMPAT_VERSION(name, version, prefix) error "should use #ifdef SHARED" #endif |