From: Bruno Haible Date: Tue, 12 Jul 2011 09:41:24 +0000 (+0200) Subject: Rename module 'link-warning' to 'snippet/link-warning'. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=213fd247515dc012d7ceb3a7b16ead96facae9d6;p=pspp Rename module 'link-warning' to 'snippet/link-warning'. * modules/snippet/link-warning: Renamed from modules/link-warning. (Files, Makefile.am): Update. * build-aux/snippet/link-warning.h: Renamed from build-aux/link-warning.h. * MODULES.html.sh (Support for building libraries and executables): Update. --- diff --git a/ChangeLog b/ChangeLog index c5f54ae383..0764d27998 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2011-07-12 Bruno Haible + Rename module 'link-warning' to 'snippet/link-warning'. + * modules/snippet/link-warning: Renamed from modules/link-warning. + (Files, Makefile.am): Update. + * build-aux/snippet/link-warning.h: Renamed from + build-aux/link-warning.h. + * MODULES.html.sh (Support for building libraries and executables): + Update. + Rename module 'c++defs' to 'snippet/c++defs'. * modules/snippet/c++defs: Renamed from modules/c++defs. (Files, Makefile.am): Update. diff --git a/MODULES.html.sh b/MODULES.html.sh index e5c476ae45..db4643e008 100755 --- a/MODULES.html.sh +++ b/MODULES.html.sh @@ -3451,7 +3451,7 @@ func_all_modules () func_module lib-ignore func_module lib-msvc-compat func_module lib-symbol-versions - func_module link-warning + func_module snippet/link-warning func_module manywarnings func_module no-c++ func_module relocatable-lib diff --git a/build-aux/link-warning.h b/build-aux/link-warning.h deleted file mode 100644 index 84708ffdc6..0000000000 --- a/build-aux/link-warning.h +++ /dev/null @@ -1,49 +0,0 @@ -/* A C macro for emitting link time warnings. - Copyright (C) 1995, 1997, 2000, 2002-2003, 2007, 2009-2011 Free Software - Foundation, Inc. - - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - -#if @HAVE_FEATURES_H@ -# include /* for __GLIBC__, __UCLIBC__ */ -#endif - -/* GL_LINK_WARNING("literal string") arranges to emit the literal string as - a linker warning on most glibc systems. - We use a linker warning rather than a preprocessor warning, because - #warning cannot be used inside macros. */ -#ifndef GL_LINK_WARNING - /* This works on platforms with GNU ld and ELF object format. - Testing __GLIBC__ is sufficient for asserting that GNU ld is in use. - Testing __ELF__ guarantees the ELF object format. - Testing __GNUC__ is necessary for the compound expression syntax. */ -# if (defined __GLIBC__ || defined __UCLIBC__) && defined __ELF__ && defined __GNUC__ -# define GL_LINK_WARNING(message) \ - GL_LINK_WARNING1 (__FILE__, __LINE__, message) -# define GL_LINK_WARNING1(file, line, message) \ - GL_LINK_WARNING2 (file, line, message) /* macroexpand file and line */ -# define GL_LINK_WARNING2(file, line, message) \ - GL_LINK_WARNING3 (file ":" #line ": warning: " message) -# define GL_LINK_WARNING3(message) \ - ({ static const char warning[sizeof (message)] \ - __attribute__ ((__unused__, \ - __section__ (".gnu.warning"), \ - __aligned__ (1))) \ - = message "\n"; \ - (void)0; \ - }) -# else -# define GL_LINK_WARNING(message) ((void) 0) -# endif -#endif diff --git a/build-aux/snippet/link-warning.h b/build-aux/snippet/link-warning.h new file mode 100644 index 0000000000..84708ffdc6 --- /dev/null +++ b/build-aux/snippet/link-warning.h @@ -0,0 +1,49 @@ +/* A C macro for emitting link time warnings. + Copyright (C) 1995, 1997, 2000, 2002-2003, 2007, 2009-2011 Free Software + Foundation, Inc. + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ + +#if @HAVE_FEATURES_H@ +# include /* for __GLIBC__, __UCLIBC__ */ +#endif + +/* GL_LINK_WARNING("literal string") arranges to emit the literal string as + a linker warning on most glibc systems. + We use a linker warning rather than a preprocessor warning, because + #warning cannot be used inside macros. */ +#ifndef GL_LINK_WARNING + /* This works on platforms with GNU ld and ELF object format. + Testing __GLIBC__ is sufficient for asserting that GNU ld is in use. + Testing __ELF__ guarantees the ELF object format. + Testing __GNUC__ is necessary for the compound expression syntax. */ +# if (defined __GLIBC__ || defined __UCLIBC__) && defined __ELF__ && defined __GNUC__ +# define GL_LINK_WARNING(message) \ + GL_LINK_WARNING1 (__FILE__, __LINE__, message) +# define GL_LINK_WARNING1(file, line, message) \ + GL_LINK_WARNING2 (file, line, message) /* macroexpand file and line */ +# define GL_LINK_WARNING2(file, line, message) \ + GL_LINK_WARNING3 (file ":" #line ": warning: " message) +# define GL_LINK_WARNING3(message) \ + ({ static const char warning[sizeof (message)] \ + __attribute__ ((__unused__, \ + __section__ (".gnu.warning"), \ + __aligned__ (1))) \ + = message "\n"; \ + (void)0; \ + }) +# else +# define GL_LINK_WARNING(message) ((void) 0) +# endif +#endif diff --git a/modules/link-warning b/modules/link-warning deleted file mode 100644 index 06f3675cb1..0000000000 --- a/modules/link-warning +++ /dev/null @@ -1,42 +0,0 @@ -Description: -A C macro for emitting link time warnings. - -Applicability: -all - -Files: -build-aux/link-warning.h - -Depends-on: - -configure.ac: -AC_REQUIRE([gl_FEATURES_H]) - -Makefile.am: -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. - -BUILT_SOURCES += link-warning.h -# The link-warning.h that gets inserted into generated .h files is the same as -# build-aux/link-warning.h, except that it has the copyright header cut off. -link-warning.h: $(top_srcdir)/build-aux/link-warning.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/HAVE_FEATURES_H/,$$p' \ - < $(top_srcdir)/build-aux/link-warning.h \ - | sed -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ - > $@-t && \ - mv $@-t $@ -MOSTLYCLEANFILES += link-warning.h link-warning.h-t - -LINK_WARNING_H=link-warning.h - -Include: - -License: -LGPLv2+ - -Maintainer: -Bruno Haible - diff --git a/modules/snippet/link-warning b/modules/snippet/link-warning new file mode 100644 index 0000000000..77945c1973 --- /dev/null +++ b/modules/snippet/link-warning @@ -0,0 +1,42 @@ +Description: +A C macro for emitting link time warnings. + +Applicability: +all + +Files: +build-aux/snippet/link-warning.h + +Depends-on: + +configure.ac: +AC_REQUIRE([gl_FEATURES_H]) + +Makefile.am: +# The BUILT_SOURCES created by this Makefile snippet are not used via #include +# statements but through direct file reference. Therefore this snippet must be +# present in all Makefile.am that need it. This is ensured by the applicability +# 'all' defined above. + +BUILT_SOURCES += link-warning.h +# The link-warning.h that gets inserted into generated .h files is the same as +# build-aux/snippet/link-warning.h, except that it has the copyright header cut +# off. +link-warning.h: $(top_srcdir)/build-aux/snippet/link-warning.h + $(AM_V_GEN)rm -f $@-t $@ && \ + sed -n -e '/HAVE_FEATURES_H/,$$p' \ + < $(top_srcdir)/build-aux/snippet/link-warning.h \ + | sed -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ + > $@-t && \ + mv $@-t $@ +MOSTLYCLEANFILES += link-warning.h link-warning.h-t + +LINK_WARNING_H=link-warning.h + +Include: + +License: +LGPLv2+ + +Maintainer: +Bruno Haible