[llvm-commits] [dragonegg] r133394 - in /dragonegg/trunk: Makefile include/dragonegg/gt-cache-4.5.h include/dragonegg/gt-cache-4.6.h src/Backend.cpp

[Duncan Sands]

Author: baldrick
Date: Sun Jun 19 08:55:12 2011
New Revision: 133394

URL: http://llvm.org/viewvc/llvm-project?rev=133394&view=rev
Log:
Uniformize the name of the garbage collector root between gcc-4.5 and gcc-4.6.

Modified:
    dragonegg/trunk/Makefile
    dragonegg/trunk/include/dragonegg/gt-cache-4.5.h
    dragonegg/trunk/include/dragonegg/gt-cache-4.6.h
    dragonegg/trunk/src/Backend.cpp

Modified: dragonegg/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/Makefile?rev=133394&r1=133393&r2=133394&view=diff
==============================================================================
--- dragonegg/trunk/Makefile (original)
+++ dragonegg/trunk/Makefile Sun Jun 19 08:55:12 2011
@@ -113,3 +113,4 @@
 	-r $(GCC_BUILD_DIR)/gcc/gtype.state \
 	-P $(GENGTYPE_OUTPUT) $(GENGTYPE_INPUT)
 	$(QUIET)sed -i "s/__.*gt/__gt/" $(GENGTYPE_OUTPUT)
+	$(QUIET)sed -i "s/_$(GCC_MAJOR)_$(GCC_MINOR)_/_/" $(GENGTYPE_OUTPUT)

Modified: dragonegg/trunk/include/dragonegg/gt-cache-4.5.h
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/include/dragonegg/gt-cache-4.5.h?rev=133394&r1=133393&r2=133394&view=diff
==============================================================================
--- dragonegg/trunk/include/dragonegg/gt-cache-4.5.h (original)
+++ dragonegg/trunk/include/dragonegg/gt-cache-4.5.h Sun Jun 19 08:55:12 2011
@@ -788,7 +788,7 @@
 
 /* GC roots.  */
 
-EXPORTED_CONST struct ggc_cache_tab gt_ggc_rc__gt_llvm_cache_h[] = {
+EXPORTED_CONST struct ggc_cache_tab gt_ggc_rc__gt_cache_h[] = {
   {
     &llvm_cache,
     1,

Modified: dragonegg/trunk/include/dragonegg/gt-cache-4.6.h
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/include/dragonegg/gt-cache-4.6.h?rev=133394&r1=133393&r2=133394&view=diff
==============================================================================
--- dragonegg/trunk/include/dragonegg/gt-cache-4.6.h (original)
+++ dragonegg/trunk/include/dragonegg/gt-cache-4.6.h Sun Jun 19 08:55:12 2011
@@ -876,7 +876,7 @@
 
 /* GC roots.  */
 
-EXPORTED_CONST struct ggc_cache_tab gt_ggc_rc__gt_cache_4_6_h[] = {
+EXPORTED_CONST struct ggc_cache_tab gt_ggc_rc__gt_cache_h[] = {
   {
     &llvm_cache,
     1,

Modified: dragonegg/trunk/src/Backend.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/Backend.cpp?rev=133394&r1=133393&r2=133394&view=diff
==============================================================================
--- dragonegg/trunk/src/Backend.cpp (original)
+++ dragonegg/trunk/src/Backend.cpp Sun Jun 19 08:55:12 2011
@@ -1970,7 +1970,7 @@
 
 
 // Garbage collector roots.
-extern const struct ggc_cache_tab gt_ggc_rc__gt_llvm_cache_h[];
+extern const struct ggc_cache_tab gt_ggc_rc__gt_cache_h[];
 
 
 /// PluginFlags - Flag arguments for the plugin.
@@ -2084,7 +2084,7 @@
 
   // Register our garbage collector roots.
   register_callback (plugin_name, PLUGIN_REGISTER_GGC_CACHES, NULL,
-                     (void *)gt_ggc_rc__gt_llvm_cache_h);
+                     (void *)gt_ggc_rc__gt_cache_h);
 
   // Perform late initialization just before processing the compilation unit.
   register_callback (plugin_name, PLUGIN_START_UNIT, llvm_start_unit, NULL);