gcc-python-plugin-commits March 2012

gcc-python-plugin-commits@lists.stg.fedorahosted.org

1 participants
104 discussions

[gcc-python-plugin] allow the use of $CC to override "gcc" in gcc-with-python and gcc-with-cpychecker
by David Hugh Malcolm 27 Mar '12

27 Mar '12

commit 72dbbbd7183201952add5182579d318f6b689409 Author: David Malcolm <dmalcolm(a)redhat.com> Date: Tue Mar 27 12:17:37 2012 -0400 allow the use of $CC to override "gcc" in gcc-with-python and gcc-with-cpychecker gcc-with-cpychecker | 2 +- gcc-with-python | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- diff --git a/gcc-with-cpychecker b/gcc-with-cpychecker index f93dad4..2d2fe0a 100755 --- a/gcc-with-cpychecker +++ b/gcc-with-cpychecker @@ -69,7 +69,7 @@ dictstr += ', "maxtrans":%i' % ns.maxtrans dictstr += ', "dump_json":%i' % ns.dump_json cmd = 'from libcpychecker import main; main(**{%s})' % dictstr -args = ['gcc', +args = [os.environ.get('CC', 'gcc'), ('-fplugin=%s' % PLUGIN), ('-fplugin-arg-python-command=%s' % cmd)] args += other_args # (the args we didn't consume) diff --git a/gcc-with-python b/gcc-with-python index f68c918..6b3c0fc 100755 --- a/gcc-with-python +++ b/gcc-with-python @@ -16,4 +16,4 @@ # along with this program. If not, see # <http://www.gnu.org/licenses/>. -gcc -fplugin=$(pwd)/python.so -fplugin-arg-python-script=$@ +${CC:-gcc} -fplugin=$(pwd)/python.so -fplugin-arg-python-script=$@

1 0

[gcc-python-plugin: 16/16] Merge pull request #2 from kevin-dot-pyle/master
by David Hugh Malcolm 27 Mar '12

27 Mar '12

commit df15eee803ecc9de79ec14b261b6eade77358828 Merge: a29cf4f 6816d4d Author: David Malcolm <dmalcolm(a)redhat.com> Date: Tue Mar 27 08:39:28 2012 -0700 Merge pull request #2 from kevin-dot-pyle/master Build system improvements Makefile | 125 +++++++++++++++++++++++---------------------------- configbuilder.py | 2 +- cpybuilder.py | 1 - gcc-python-option.c | 2 +- gcc-python.c | 7 +++- run-test-suite.py | 2 +- test-builder.py | 4 +- testcpybuilder.py | 2 +- 8 files changed, 68 insertions(+), 77 deletions(-) ---

1 0

[gcc-python-plugin: 15/16] Build: prevent deletion of autogenerated-*.c
by David Hugh Malcolm 27 Mar '12

27 Mar '12

commit 6816d4d1737943ca5a0bf262b1863007c968493d Author: Kevin Pyle <gcc-python-plugin.8eaf7cd8e5128d8191fe(a)spamgourmet.com> Date: Mon Mar 26 21:34:14 2012 -0500 Build: prevent deletion of autogenerated-*.c Per comment from David Malcolm, deleting autogenerated-*.c files is undesirable because it makes debugging more difficult. Switch to a static pattern rule to discourage Make from deleting these files. Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/Makefile b/Makefile index e94c82f..cd177ce 100644 --- a/Makefile +++ b/Makefile @@ -134,7 +134,7 @@ autogenerated-config.h: $(addprefix $(srcdir),generate-config-h.py configbuilder autogenerated-%.txt: $(srcdir)%.txt.in $(CPP) $(CPPFLAGS) -x c-header $^ -o $@ -autogenerated-%.c: $(addprefix $(srcdir),generate-%-c.py $(GENERATOR_DEPS)) +$(PLUGIN_GENERATED_SOURCE_FILES): autogenerated-%.c: $(addprefix $(srcdir),generate-%-c.py $(GENERATOR_DEPS)) $(PYTHON) $< > $@ autogenerated-gimple.c: autogenerated-gimple-types.txt autogenerated-tree-types.txt autogenerated-rtl-types.txt $(srcdir)maketreetypes.py

1 0

[gcc-python-plugin: 14/16] Build: cpybuilder.py does not use six.py, so remove import
by David Hugh Malcolm 27 Mar '12

27 Mar '12

commit 687460b420e884c7f36b71855ff6d955103c3a95 Author: Kevin Pyle <gcc-python-plugin.8eaf7cd8e5128d8191fe(a)spamgourmet.com> Date: Sun Mar 25 15:27:45 2012 -0500 Build: cpybuilder.py does not use six.py, so remove import Remove unnecessary import of six.py, so that gcc-python-plugin can be built (although not tested) without installing six.py. cpybuilder.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) --- diff --git a/cpybuilder.py b/cpybuilder.py index 41f613d..3dc36fb 100644 --- a/cpybuilder.py +++ b/cpybuilder.py @@ -17,7 +17,6 @@ from subprocess import Popen, PIPE import re -import six # For the purpose of the GCC plugin, it's OK to assume that we're compiling # with GCC itself, and thus we can use GCC extensions

1 0

[gcc-python-plugin: 13/16] Build: move name 'python.so' to Make variable
by David Hugh Malcolm 27 Mar '12

27 Mar '12

commit 4f23afefa35c2555f7a96f70ac26ab79ab0796e3 Author: Kevin Pyle <gcc-python-plugin.8eaf7cd8e5128d8191fe(a)spamgourmet.com> Date: Sun Mar 25 12:28:39 2012 -0500 Build: move name 'python.so' to Make variable Allow the user to change the name of the generated shared object by specifying an alternate $GCC_PYTHON_PLUGIN_SO on the command line. Makefile | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) --- diff --git a/Makefile b/Makefile index db854ff..e94c82f 100644 --- a/Makefile +++ b/Makefile @@ -97,6 +97,8 @@ PYTHON_CONFIG=python-config PYTHON_INCLUDES=$(shell $(PYTHON_CONFIG) --includes) PYTHON_LIBS=$(shell $(PYTHON_CONFIG) --libs) +GCC_PYTHON_PLUGIN_SO := python.so + CPPFLAGS+= -I$(GCCPLUGINS_DIR)/include -I$(GCCPLUGINS_DIR)/include/c-family -I. $(PYTHON_INCLUDES) # Allow user to pick optimization, choose whether warnings are fatal, # and choose debugging information level. @@ -110,9 +112,9 @@ endif all: autogenerated-config.h testcpybuilder test-suite testcpychecker -plugin: autogenerated-config.h python.so +plugin: autogenerated-config.h $(GCC_PYTHON_PLUGIN_SO) -python.so: $(PLUGIN_OBJECT_FILES) +$(GCC_PYTHON_PLUGIN_SO): $(PLUGIN_OBJECT_FILES) $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared $^ -o $@ $(LIBS) $(PLUGIN_OBJECT_GENERATED_FILES): CPPFLAGS+= $(if $(srcdir),-I$(srcdir)) @@ -145,7 +147,7 @@ autogenerated-variable.c: autogenerated-gimple-types.txt $(srcdir)maketreetypes. # Doing so seems to require that paths be absolute, rather than relative # to this directory TEST_CFLAGS= \ - -fplugin=$(CURDIR)/python.so \ + -fplugin=$(CURDIR)/$(GCC_PYTHON_PLUGIN_SO) \ -fplugin-arg-python-script=test.py # A catch-all test for quick experimentation with the API:

1 0

[gcc-python-plugin: 12/16] Build: find c-pragma.h, c-common.h regardless of gcc version
by David Hugh Malcolm 27 Mar '12

27 Mar '12

commit 598c56676f6a217543701590c91c91931041179f Author: Kevin Pyle <gcc-python-plugin.8eaf7cd8e5128d8191fe(a)spamgourmet.com> Date: Sun Mar 25 12:14:59 2012 -0500 Build: find c-pragma.h,c-common.h regardless of gcc version Add an extra -I line for the non-flattened location, then change all inclusions to rely on the preprocessor search path to find the file. It is legal to specify a non-existent directory in the search path, so this will work with both old and new layouts. Makefile | 2 +- gcc-python-option.c | 2 +- gcc-python.c | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) --- diff --git a/Makefile b/Makefile index d5ee30c..db854ff 100644 --- a/Makefile +++ b/Makefile @@ -97,7 +97,7 @@ PYTHON_CONFIG=python-config PYTHON_INCLUDES=$(shell $(PYTHON_CONFIG) --includes) PYTHON_LIBS=$(shell $(PYTHON_CONFIG) --libs) -CPPFLAGS+= -I$(GCCPLUGINS_DIR)/include -I. $(PYTHON_INCLUDES) +CPPFLAGS+= -I$(GCCPLUGINS_DIR)/include -I$(GCCPLUGINS_DIR)/include/c-family -I. $(PYTHON_INCLUDES) # Allow user to pick optimization, choose whether warnings are fatal, # and choose debugging information level. CFLAGS?=-O2 -Werror -g diff --git a/gcc-python-option.c b/gcc-python-option.c index 04835f5..1413137 100644 --- a/gcc-python-option.c +++ b/gcc-python-option.c @@ -20,7 +20,7 @@ #include <Python.h> #include "gcc-python.h" #include "gcc-python-wrappers.h" -#include "c-family/c-common.h" /* for warn_format */ +#include "c-common.h" /* for warn_format */ #include "diagnostic.h" diff --git a/gcc-python.c b/gcc-python.c index 6204bd4..f037988 100644 --- a/gcc-python.c +++ b/gcc-python.c @@ -34,7 +34,12 @@ int plugin_is_GPL_compatible; #include "cgraph.h" #include "opts.h" -#include "c-family/c-pragma.h" /* for parse_in */ +/* + * Use an unqualified name here and rely on dual search paths to let the + * compiler find it. This deals with c-pragma.h moving to a + * subdirectory in newer versions of gcc. + */ +#include "c-pragma.h" /* for parse_in */ #if 0 #define LOG(msg) \

1 0

[gcc-python-plugin: 11/16] Build: only use Python includes, not all Python CFLAGS
by David Hugh Malcolm 27 Mar '12

27 Mar '12

commit 99da8c8d990d254b328f4b65d4d58f527c8acb74 Author: Kevin Pyle <gcc-python-plugin.8eaf7cd8e5128d8191fe(a)spamgourmet.com> Date: Sat Mar 24 18:05:22 2012 -0500 Build: only use Python includes, not all Python CFLAGS Python CFLAGS may contain settings that conflict with our own preferences, such as alternate optimization, debug, or warning choices. We only need to know where the headers were installed, so switch to --includes instead of --cflags. Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- diff --git a/Makefile b/Makefile index 3abb5c7..d5ee30c 100644 --- a/Makefile +++ b/Makefile @@ -94,15 +94,15 @@ PYTHON_CONFIG=python-config #PYTHON=python3-debug #PYTHON_CONFIG=python3.2dmu-config -PYTHON_CFLAGS=$(shell $(PYTHON_CONFIG) --cflags) +PYTHON_INCLUDES=$(shell $(PYTHON_CONFIG) --includes) PYTHON_LIBS=$(shell $(PYTHON_CONFIG) --libs) -CPPFLAGS+= -I$(GCCPLUGINS_DIR)/include -I. +CPPFLAGS+= -I$(GCCPLUGINS_DIR)/include -I. $(PYTHON_INCLUDES) # Allow user to pick optimization, choose whether warnings are fatal, # and choose debugging information level. CFLAGS?=-O2 -Werror -g # Force these settings -CFLAGS+= -fPIC -fno-strict-aliasing -Wall $(PYTHON_CFLAGS) +CFLAGS+= -fPIC -fno-strict-aliasing -Wall LIBS+= $(PYTHON_LIBS) ifneq "$(PLUGIN_PYTHONPATH)" "" CPPFLAGS+= -DPLUGIN_PYTHONPATH='"$(PLUGIN_PYTHONPATH)"'

1 0

[gcc-python-plugin: 10/16] Build: enable out-of-tree build
by David Hugh Malcolm 27 Mar '12

27 Mar '12

commit 40334a9febd8128bfd9609af893b4f58fb2c2058 Author: Kevin Pyle <gcc-python-plugin.8eaf7cd8e5128d8191fe(a)spamgourmet.com> Date: Sat Mar 24 16:12:29 2012 -0500 Build: enable out-of-tree build Add $(srcdir) so that the caller can run "make -f $PATH_TO_SOURCE/Makefile srcdir=$PATH_TO_SOURCE". By default, srcdir will be blank, so this should have no effect on in-tree builds. Makefile | 47 +++++++++++++++++++++++++++++------------------ 1 files changed, 29 insertions(+), 18 deletions(-) --- diff --git a/Makefile b/Makefile index d8d2fd8..3abb5c7 100644 --- a/Makefile +++ b/Makefile @@ -37,6 +37,8 @@ PLUGIN_SOURCE_FILES= \ gcc-python-variable.c \ gcc-python-version.c \ gcc-python-wrapper.c \ + +PLUGIN_GENERATED_SOURCE_FILES:= \ autogenerated-callgraph.c \ autogenerated-cfg.c \ autogenerated-option.c \ @@ -50,7 +52,9 @@ PLUGIN_SOURCE_FILES= \ autogenerated-tree.c \ autogenerated-variable.c -PLUGIN_OBJECT_FILES= $(patsubst %.c,%.o,$(PLUGIN_SOURCE_FILES)) +PLUGIN_OBJECT_SOURCE_FILES:= $(patsubst %.c,%.o,$(PLUGIN_SOURCE_FILES)) +PLUGIN_OBJECT_GENERATED_FILES:= $(patsubst %.c,%.o,$(PLUGIN_GENERATED_SOURCE_FILES)) +PLUGIN_OBJECT_FILES:= $(PLUGIN_OBJECT_SOURCE_FILES) $(PLUGIN_OBJECT_GENERATED_FILES) GCCPLUGINS_DIR:= $(shell $(CC) --print-file-name=plugin) GENERATOR_DEPS=cpybuilder.py wrapperbuilder.py @@ -91,15 +95,15 @@ PYTHON_CONFIG=python-config #PYTHON_CONFIG=python3.2dmu-config PYTHON_CFLAGS=$(shell $(PYTHON_CONFIG) --cflags) -PYTHON_LDFLAGS=$(shell $(PYTHON_CONFIG) --ldflags) +PYTHON_LIBS=$(shell $(PYTHON_CONFIG) --libs) -CPPFLAGS+= -I$(GCCPLUGINS_DIR)/include +CPPFLAGS+= -I$(GCCPLUGINS_DIR)/include -I. # Allow user to pick optimization, choose whether warnings are fatal, # and choose debugging information level. CFLAGS?=-O2 -Werror -g # Force these settings CFLAGS+= -fPIC -fno-strict-aliasing -Wall $(PYTHON_CFLAGS) -LDFLAGS+= $(PYTHON_LDFLAGS) +LIBS+= $(PYTHON_LIBS) ifneq "$(PLUGIN_PYTHONPATH)" "" CPPFLAGS+= -DPLUGIN_PYTHONPATH='"$(PLUGIN_PYTHONPATH)"' endif @@ -109,25 +113,32 @@ all: autogenerated-config.h testcpybuilder test-suite testcpychecker plugin: autogenerated-config.h python.so python.so: $(PLUGIN_OBJECT_FILES) - $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared $^ -o $@ + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared $^ -o $@ $(LIBS) + +$(PLUGIN_OBJECT_GENERATED_FILES): CPPFLAGS+= $(if $(srcdir),-I$(srcdir)) + +# This is the standard .c->.o recipe, but it needs to be stated +# explicitly to support the case that $(srcdir) is not blank. +$(PLUGIN_OBJECT_SOURCE_FILES): %.o: $(srcdir)%.c autogenerated-config.h $(srcdir)gcc-python.h + $(COMPILE.c) $(OUTPUT_OPTION) $< clean: $(RM) *.so *.o autogenerated* $(RM) -r docs/_build -autogenerated-config.h: configbuilder.py generate-config-h.py - $(PYTHON) generate-config-h.py -o $@ --gcc=$(CC) +autogenerated-config.h: $(addprefix $(srcdir),generate-config-h.py configbuilder.py) + $(PYTHON) $< -o $@ --gcc=$(CC) -autogenerated-%.txt: %.txt.in +autogenerated-%.txt: $(srcdir)%.txt.in $(CPP) $(CPPFLAGS) -x c-header $^ -o $@ -autogenerated-%.c: generate-%-c.py $(GENERATOR_DEPS) +autogenerated-%.c: $(addprefix $(srcdir),generate-%-c.py $(GENERATOR_DEPS)) $(PYTHON) $< > $@ -autogenerated-gimple.c: autogenerated-gimple-types.txt maketreetypes.py -autogenerated-tree.c: autogenerated-tree-types.txt maketreetypes.py -autogenerated-rtl.c: autogenerated-rtl-types.txt maketreetypes.py -autogenerated-variable.c: autogenerated-gimple-types.txt maketreetypes.py +autogenerated-gimple.c: autogenerated-gimple-types.txt autogenerated-tree-types.txt autogenerated-rtl-types.txt $(srcdir)maketreetypes.py +autogenerated-tree.c: autogenerated-tree-types.txt $(srcdir)maketreetypes.py +autogenerated-rtl.c: autogenerated-rtl-types.txt $(srcdir)maketreetypes.py +autogenerated-variable.c: autogenerated-gimple-types.txt $(srcdir)maketreetypes.py # Hint for debugging: add -v to the gcc options # to get a command line for invoking individual subprocesses @@ -157,16 +168,16 @@ debug: plugin # A simple demo, to make it easy to demonstrate the cpychecker: demo: plugin - ./gcc-with-cpychecker $(PYTHON_CFLAGS) demo.c + $(srcdir)./gcc-with-cpychecker $(PYTHON_CFLAGS) demo.c json-examples: plugin - ./gcc-with-cpychecker -I/usr/include/python2.7 libcpychecker/html/test/example1/bug.c + $(srcdir)./gcc-with-cpychecker -I/usr/include/python2.7 libcpychecker/html/test/example1/bug.c test-suite: plugin $(PYTHON) run-test-suite.py show-ssa: plugin - ./gcc-with-python examples/show-ssa.py test.c + $(srcdir)./gcc-with-python examples/show-ssa.py test.c html: docs/tables-of-passes.rst docs/passes.svg cd docs && $(MAKE) html @@ -174,11 +185,11 @@ html: docs/tables-of-passes.rst docs/passes.svg # We commit this generated file to SCM to allow the docs to be built without # needing to build the plugin: docs/tables-of-passes.rst: plugin generate-tables-of-passes-rst.py - ./gcc-with-python generate-tables-of-passes-rst.py test.c > $@ + $(srcdir)./gcc-with-python generate-tables-of-passes-rst.py test.c > $@ # Likewise for this generated file: docs/passes.svg: plugin generate-passes-svg.py - ./gcc-with-python generate-passes-svg.py test.c + $(srcdir)./gcc-with-python generate-passes-svg.py test.c # Utility target, to help me to make releases # - creates a tag in git, and pushes it

1 0

[gcc-python-plugin: 9/16] Build: tarball: disallow empty version
by David Hugh Malcolm 27 Mar '12

27 Mar '12

commit 4a34de52589e84e2a328c5092db2241a961adab0 Author: Kevin Pyle <gcc-python-plugin.8eaf7cd8e5128d8191fe(a)spamgourmet.com> Date: Sun Mar 18 16:21:29 2012 -0500 Build: tarball: disallow empty version An empty version is almost certainly a misspelled invocation. Disallow it. Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) --- diff --git a/Makefile b/Makefile index 892efd7..d8d2fd8 100644 --- a/Makefile +++ b/Makefile @@ -188,6 +188,7 @@ docs/passes.svg: plugin generate-passes-svg.py # $ make tarball VERSION=0.4 $(HOME)/rpmbuild/SOURCES/%.tar.gz: + test -n "$(VERSION)" -git tag -d v$(VERSION) git tag -a v$(VERSION) -m"$(VERSION)" git archive --format=tar --prefix=$*/ v$(VERSION) | gzip > $*.tar.gz

1 0

[gcc-python-plugin: 8/16] Build: rework 'tarball' to remove redundant references to output name
by David Hugh Malcolm 27 Mar '12

27 Mar '12

commit 4f4e14cb5b9ebe864f34d6144abda46e0edd6e90 Author: Kevin Pyle <gcc-python-plugin.8eaf7cd8e5128d8191fe(a)spamgourmet.com> Date: Sun Mar 18 16:21:29 2012 -0500 Build: rework 'tarball' to remove redundant references to output name Makefile | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) --- diff --git a/Makefile b/Makefile index eb82bb2..892efd7 100644 --- a/Makefile +++ b/Makefile @@ -187,12 +187,14 @@ docs/passes.svg: plugin generate-passes-svg.py # The following assumes that VERSION has been set e.g. # $ make tarball VERSION=0.4 -tarball: +$(HOME)/rpmbuild/SOURCES/%.tar.gz: -git tag -d v$(VERSION) git tag -a v$(VERSION) -m"$(VERSION)" - git archive --format=tar --prefix=gcc-python-plugin-$(VERSION)/ v$(VERSION) | gzip > gcc-python-plugin-$(VERSION).tar.gz - sha256sum gcc-python-plugin-$(VERSION).tar.gz - cp gcc-python-plugin-$(VERSION).tar.gz ~/rpmbuild/SOURCES/ + git archive --format=tar --prefix=$*/ v$(VERSION) | gzip > $*.tar.gz + sha256sum $*.tar.gz + cp $*.tar.gz $@ + +tarball: $(HOME)/rpmbuild/SOURCES/gcc-python-plugin-$(VERSION).tar.gz # Notes to self on making a release # ---------------------------------

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

gcc-python-plugin-commits March 2012