Index: tests/.expect/attributes.x86.txt
===================================================================
--- tests/.expect/attributes.x86.txt	(revision 1e93617e61056825b438e441fceb09896deba565)
+++ tests/.expect/attributes.x86.txt	(revision db19e1d0d4adcc296ca7022c295f441155d4b6dc)
@@ -1,3 +1,3 @@
-signed int _X2laFi___1(){
+signed int _X2laFi___1(void){
     __attribute__ ((unused)) signed int _X10_retval_lai_1;
     {
@@ -1179,5 +1179,5 @@
 
 }
-__attribute__ ((unused)) signed int _X1fFi___1() asm ( "xyz" );
+__attribute__ ((unused)) signed int _X1fFi___1(void) asm ( "xyz" );
 __attribute__ ((used,used)) const signed int _X3vd1Ki_1;
 __attribute__ ((used,unused)) const signed int _X3vd2Ki_1;
@@ -1186,14 +1186,14 @@
 __attribute__ ((used,used,used)) const signed int _X3vd5A0Ki_1[((unsigned int )5)];
 __attribute__ ((used,used,unused,used)) const signed int _X3vd6A0Ki_1[((unsigned int )5)];
-__attribute__ ((used,used,used,used)) const signed int (*_X3vd7Fi___1)();
-__attribute__ ((used,used,unused,used,used)) const signed int (*_X3vd8Fi___1)();
-__attribute__ ((used,used,used,used)) const signed int (*_X3vd9Fi___1)();
-__attribute__ ((used,used,unused,used,used)) const signed int (*_X4vd10Fi___1)();
-__attribute__ ((unused,used)) signed int _X2f1Fi___1();
-__attribute__ ((unused)) signed int _X2f1Fi___1(){
+__attribute__ ((used,used,used,used)) const signed int (*_X3vd7Fi___1)(void);
+__attribute__ ((used,used,unused,used,used)) const signed int (*_X3vd8Fi___1)(void);
+__attribute__ ((used,used,used,used)) const signed int (*_X3vd9Fi___1)(void);
+__attribute__ ((used,used,unused,used,used)) const signed int (*_X4vd10Fi___1)(void);
+__attribute__ ((unused,used)) signed int _X2f1Fi___1(void);
+__attribute__ ((unused)) signed int _X2f1Fi___1(void){
     __attribute__ ((unused)) signed int _X10_retval_f1i_1;
 }
-__attribute__ ((unused,unused,unused,used)) signed int **const _X2f2FPPi___1();
-__attribute__ ((unused,unused,unused)) signed int **const _X2f2FPPi___1(){
+__attribute__ ((unused,unused,unused,used)) signed int **const _X2f2FPPi___1(void);
+__attribute__ ((unused,unused,unused)) signed int **const _X2f2FPPi___1(void){
     __attribute__ ((unused)) signed int **const _X10_retval_f2KPPi_1;
 }
@@ -1206,15 +1206,15 @@
     __attribute__ ((unused)) signed int (*_X10_retval_f6PA0i_1)[];
 }
-__attribute__ ((unused,used,unused)) signed int (*_X2f7FFi_i____1())(signed int __param_0);
-__attribute__ ((unused,unused)) signed int (*_X2f8FFi_i____1())(signed int __param_0){
+__attribute__ ((unused,used,unused)) signed int (*_X2f7FFi_i____1(void))(signed int __param_0);
+__attribute__ ((unused,unused)) signed int (*_X2f8FFi_i____1(void))(signed int __param_0){
     __attribute__ ((unused)) signed int (*_X10_retval_f8Fi_i__1)(signed int __param_0);
 }
-__attribute__ ((unused,unused)) signed int (*_X2f9FFi_i____1())(signed int __param_0){
+__attribute__ ((unused,unused)) signed int (*_X2f9FFi_i____1(void))(signed int __param_0){
     __attribute__ ((unused)) signed int (*_X10_retval_f9Fi_i__1)(signed int __param_0);
 }
-__attribute__ ((unused,unused)) signed int (*_X3f10FFi_i____1())(signed int __param_0){
+__attribute__ ((unused,unused)) signed int (*_X3f10FFi_i____1(void))(signed int __param_0){
     __attribute__ ((unused)) signed int (*_X11_retval_f10Fi_i__1)(signed int __param_0);
 }
-signed int _X3vtrFi___1(){
+signed int _X3vtrFi___1(void){
     __attribute__ ((unused)) signed int _X11_retval_vtri_1;
     __attribute__ ((unused,unused,used)) signed int _X2t1i_2;
@@ -1223,6 +1223,6 @@
     __attribute__ ((unused,unused,unused,unused,unused)) signed int **_X2t4A0PPi_2[((unsigned int )5)];
     __attribute__ ((unused,unused,unused,unused,unused,unused)) signed int **_X2t5A0PPi_2[((unsigned int )5)];
-    __attribute__ ((unused,unused,unused)) signed int _X2t6Fi___2();
-    __attribute__ ((unused,unused,unused,unused)) signed int *_X2t6FPi___2();
+    __attribute__ ((unused,unused,unused)) signed int _X2t6Fi___2(void);
+    __attribute__ ((unused,unused,unused,unused)) signed int *_X2t6FPi___2(void);
 }
 signed int _X4ipd1Fi_ii__1(__attribute__ ((unused,unused,unused)) signed int _X1pi_1, __attribute__ ((unused,unused,unused)) signed int _X1qi_1);
@@ -1238,6 +1238,6 @@
     __attribute__ ((unused)) signed int _X12_retval_ipd3i_1;
 }
-signed int _X4ipd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)());
-signed int _X4ipd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)()){
+signed int _X4ipd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(void), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)(void));
+signed int _X4ipd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(void), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)(void)){
     __attribute__ ((unused)) signed int _X12_retval_ipd4i_1;
 }
@@ -1246,8 +1246,8 @@
 signed int _X4tpr3Fi_Pi__1(__attribute__ ((unused,unused,unused)) signed int *_X3FooPi_1);
 signed int _X4tpr4Fi_Fi_Pi___1(__attribute__ ((unused,unused)) signed int (*__anonymous_object2)(signed int __param_0[((unsigned int )5)]));
-signed int _X4tpr5Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X3FooFi___1)());
-signed int _X4tpr6Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X3FooFi___1)());
+signed int _X4tpr5Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X3FooFi___1)(void));
+signed int _X4tpr6Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X3FooFi___1)(void));
 signed int _X4tpr7Fi_Fi_Fi_i____1(__attribute__ ((unused,unused)) signed int (*__anonymous_object3)(signed int (*__param_0)(signed int __param_0)));
-signed int _X2adFi___1(){
+signed int _X2adFi___1(void){
     __attribute__ ((unused)) signed int _X10_retval_adi_1;
     __attribute__ ((used,unused)) signed int _X3ad1i_2;
@@ -1256,5 +1256,5 @@
     __attribute__ ((unused,unused,unused,unused,unused)) signed int (*_X3ad4PA0i_2)[((unsigned int )10)];
     __attribute__ ((unused,unused,unused,unused,used)) signed int _X3ad5i_2;
-    __attribute__ ((unused,unused,unused,unused,unused)) signed int _X3ad6Fi___2();
+    __attribute__ ((unused,unused,unused,unused,unused)) signed int _X3ad6Fi___2(void);
     {
         ((void)sizeof(__attribute__ ((unused,unused)) signed int ));
@@ -1274,5 +1274,5 @@
 
     {
-        ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int ()));
+        ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int (void)));
     }
 
@@ -1348,7 +1348,7 @@
 signed int _X4apd2Fi_PPiPPi__1(__attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object6, __attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object7);
 signed int _X4apd3Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object8, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object9);
-signed int _X4apd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object10)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object11)());
+signed int _X4apd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object10)(void), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object11)(void));
 signed int _X4apd5Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object12)(signed int __param_0), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object13)(signed int __param_0));
-signed int _X4apd6Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object14)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object15)());
+signed int _X4apd6Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object14)(void), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object15)(void));
 signed int _X4apd7Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object16)(__attribute__ ((unused)) signed int __param_0), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object17)(__attribute__ ((unused)) signed int __param_0));
 struct Vad {
