Patchwork [4.6/4.7] fix installation of plugin header files

login
register
mail settings
Submitter Matthias Klose
Date June 20, 2011, 1:44 p.m.
Message ID <4DFF4EB6.5010902@ubuntu.com>
Download mbox | patch
Permalink /patch/101126/
State New
Headers show

Comments

Matthias Klose - June 20, 2011, 1:44 p.m.
Two issues with the installation of plugin header files.

 - the c-family/* headers are used with the the c-family/ prefix
   in include directives. therefore they must not installed into
   the flattened plugin include dir, but kept in the subdir.

 - PR45078; vxworks-dummy.h is included for cpu_type in arm,
   i386, mips, sh and sparc but only installed when it's i386; copy it
   manually anytime.

Ok for the trunk and the 4.6 branch?

  Matthias
Joseph S. Myers - June 20, 2011, 3:18 p.m.
On Mon, 20 Jun 2011, Matthias Klose wrote:

>  - PR45078; vxworks-dummy.h is included for cpu_type in arm,
>    i386, mips, sh and sparc but only installed when it's i386; copy it
>    manually anytime.

I don't think you should list particular config/ headers in PLUGIN_HEADERS 
in Makefile.in; provide a way for targets to specify their additions to 
this list in config.gcc instead.  Is the issue headers that are directly 
#included from tm.h headers (for whatever reason) rather than listed in 
tm_file?  (Some of those #includes may be avoidable, but the .def ones 
probably do need listing explicitly.)

The aim should be to get the extra files in tm_file_list, which is 
included in PLUGIN_HEADERS, so that they appear in $(TM_H) dependencies as 
well.

Patch


	PR plugin/45078
	* Makefile.in (PLUGIN_HEADERS): Add config/arm/arm-cores.def,
	config/vxworks-dummy.h.
	(install-plugin): Install c-family headers into a c-family subdir.

--- gcc/Makefile.in
+++ gcc/Makefile.in
@@ -4503,6 +4503,7 @@ 
   $(EXCEPT_H) tree-ssa-sccvn.h real.h output.h $(IPA_UTILS_H) \
   $(C_PRAGMA_H)  $(CPPLIB_H)  $(FUNCTION_H) \
   cppdefault.h flags.h $(MD5_H) params.def params.h prefix.h tree-inline.h \
+  config/arm/arm-cores.def config/vxworks-dummy.h \
   $(IPA_PROP_H) $(RTL_H) $(TM_P_H) $(CFGLOOP_H) $(EMIT_RTL_H) version.h
 
 # generate the 'build fragment' b-header-vars
@@ -4527,7 +4528,7 @@ 
 	  else continue; \
 	  fi; \
 	  case $$path in \
-	  "$(srcdir)"/config/* | "$(srcdir)"/*.def ) \
+	  "$(srcdir)"/config/* | "$(srcdir)"/c-family/* | "$(srcdir)"/*.def ) \
 	    base=`echo "$$path" | sed -e "s|$$srcdirstrip/||"`;; \
 	  *) base=`basename $$path` ;; \
 	  esac; \