[arm] PR target/79260: Fix header installation for plugins

Message ID 6f5ed29b-ea3f-6f63-9ac6-e0910414285a@arm.com
State New
Headers show

Commit Message

Richard Earnshaw (lists) Jan. 30, 2017, 2:45 p.m.
The recent changes to the header infrastructure for ARM targets broke
building of plugins due to missing headers.

Patch below, tested on a cross build plus visual examination of the
install infrastructure.

PR target/79260
* config.gcc (arm*-*-*): Add arm/arm-flags.h and arm/arm-isa.h to tm_p_file.
* arm/arm-protos.h: Don't directly include arm-flags.h and arm-isa.h.

Patch hide | download patch | download mbox

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 03b1894..bc389eb 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -571,7 +571,7 @@  x86_64-*-*)
 	tm_file="vxworks-dummy.h ${tm_file}"
 	;;
 arm*-*-*)
-	tm_p_file="${tm_p_file} arm/aarch-common-protos.h"
+	tm_p_file="arm/arm-flags.h arm/arm-isa.h ${tm_p_file} arm/aarch-common-protos.h"
 	tm_file="vxworks-dummy.h ${tm_file}"
 	;;
 mips*-*-* | sh*-*-* | sparc*-*-*)
diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h
index 1b16239..680a1e6 100644
--- a/gcc/config/arm/arm-protos.h
+++ b/gcc/config/arm/arm-protos.h
@@ -22,8 +22,6 @@ 
 #ifndef GCC_ARM_PROTOS_H
 #define GCC_ARM_PROTOS_H
 
-#include "arm-flags.h"
-#include "arm-isa.h"
 #include "sbitmap.h"
 
 extern enum unwind_info_type arm_except_unwind_info (struct gcc_options *);