Re: flatten expr.h (version 2)

[Prathamesh Kulkarni <prathamesh dot kulkarni at linaro dot org>]

On 21 January 2015 at 23:18, Eric Botcazou <ebotcazou@adacore.com> wrote:
>> Thanks. I had wrongly made eliminate_constant_term() static, reverted
>> that change and it builds on
>> all targets in config-list.mk.
>> Committed as r219655 (hopefully nothing breaks!).
>
> Any particular reason why store_bit_field, extract_bit_field, extract_low_bits
> expand_mult and expand_mult_highpart_adjust are declared in emit-rtl.h?
Thanks, moved them to expmed.h.
Boostrapped on x86_64-unknown-linux-gnu with languages: all, testing
in progress.
Build on all targets in config-list.mk in progress.
Assuming it goes fine, OK to commit ?

Thanks,
Prathamesh
>
> --
> Eric Botcazou

Attachment: Changelog.txt
Description: Text document

Index: gcc/emit-rtl.h
===================================================================
--- gcc/emit-rtl.h	(revision 219882)
+++ gcc/emit-rtl.h	(working copy)
@@ -189,17 +189,4 @@
    MODE and adjusted by OFFSET.  */
 extern rtx widen_memory_access (rtx, machine_mode, HOST_WIDE_INT);
 
-extern void store_bit_field (rtx, unsigned HOST_WIDE_INT,
-			     unsigned HOST_WIDE_INT,
-			     unsigned HOST_WIDE_INT,
-			     unsigned HOST_WIDE_INT,
-			     machine_mode, rtx);
-extern rtx extract_bit_field (rtx, unsigned HOST_WIDE_INT,
-			      unsigned HOST_WIDE_INT, int, rtx,
-			      machine_mode, machine_mode);
-extern rtx extract_low_bits (machine_mode, machine_mode, rtx);
-extern rtx expand_mult (machine_mode, rtx, rtx, rtx, int);
-extern rtx expand_mult_highpart_adjust (machine_mode, rtx, rtx, rtx, rtx, int);
-
-
 #endif /* GCC_EMIT_RTL_H */
Index: gcc/expmed.h
===================================================================
--- gcc/expmed.h	(revision 219882)
+++ gcc/expmed.h	(working copy)
@@ -703,4 +703,16 @@
 			  rtx, int);
 #endif
 
+extern void store_bit_field (rtx, unsigned HOST_WIDE_INT,
+			     unsigned HOST_WIDE_INT,
+			     unsigned HOST_WIDE_INT,
+			     unsigned HOST_WIDE_INT,
+			     machine_mode, rtx);
+extern rtx extract_bit_field (rtx, unsigned HOST_WIDE_INT,
+			      unsigned HOST_WIDE_INT, int, rtx,
+			      machine_mode, machine_mode);
+extern rtx extract_low_bits (machine_mode, machine_mode, rtx);
+extern rtx expand_mult (machine_mode, rtx, rtx, rtx, int);
+extern rtx expand_mult_highpart_adjust (machine_mode, rtx, rtx, rtx, rtx, int);
+
 #endif  // EXPMED_H