Index: src/tests/.expect/64/attributes.txt
===================================================================
--- src/tests/.expect/64/attributes.txt	(revision 9fcdfa3168e27173a000528e387fcd2b4cd18b44)
+++ src/tests/.expect/64/attributes.txt	(revision 47f942244188da911b9356d8220e028c99613c0c)
@@ -9,5 +9,5 @@
     L: __attribute__ ((unused)) ((void)1);
 }
-struct __attribute__ ((unused)) __anonymous0 {
+__attribute__ ((unused)) struct __anonymous0 {
 };
 static inline void ___constructor__F_P13s__anonymous0_autogen___1(struct __anonymous0 *___dst__P13s__anonymous0_1);
@@ -24,6 +24,6 @@
     return ((struct __anonymous0 )___src__13s__anonymous0_1);
 }
-struct __attribute__ ((unused)) Agn1;
-struct __attribute__ ((unused)) Agn2 {
+__attribute__ ((unused)) struct Agn1;
+__attribute__ ((unused)) struct Agn2 {
 };
 static inline void ___constructor__F_P5sAgn2_autogen___1(struct Agn2 *___dst__P5sAgn2_1);
@@ -47,6 +47,6 @@
     __E2__C5eAgn3_1,
 };
-struct __attribute__ ((unused)) __anonymous2;
-struct __attribute__ ((unused)) __anonymous3;
+__attribute__ ((unused)) struct __anonymous2;
+__attribute__ ((unused)) struct __anonymous3;
 struct Fdl {
     __attribute__ ((unused)) int __f1__i_1;
@@ -234,10 +234,4 @@
     int (*___retval_f4__PFi_i__1)(int __anonymous_object4);
 }
-__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(long unsigned int __size);
-__attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr);
-__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void);
-__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern int atexit0(void (*__func)(void), void *__anonymous_object5, void *__anonymous_object6);
-__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(int __status);
-__attribute__ ((format(printf, 1, 2))) extern int printf(const char *__restrict __format, ...);
 int __vtr__Fi___1(){
     int ___retval_vtr__i_1;
@@ -268,8 +262,8 @@
 int __tpr2__Fi_PPi__1(__attribute__ ((unused,unused,unused,unused,unused,unused)) int **__Foo__PPi_1);
 int __tpr3__Fi_Pi__1(__attribute__ ((unused,unused,unused)) int *__Foo__Pi_1);
-int __tpr4__Fi_PFi_Pi___1(__attribute__ ((unused,unused)) int (*__anonymous_object7)(__attribute__ ((unused,unused)) int __anonymous_object8[((long unsigned int )5)]));
+int __tpr4__Fi_PFi_Pi___1(__attribute__ ((unused,unused)) int (*__anonymous_object5)(__attribute__ ((unused,unused)) int __anonymous_object6[((long unsigned int )5)]));
 int __tpr5__Fi_PFi____1(__attribute__ ((unused,unused,unused)) int (*__Foo__PFi___1)());
 int __tpr6__Fi_PFi____1(__attribute__ ((unused,unused,unused)) int (*__Foo__PFi___1)());
-int __tpr7__Fi_PFi_PFi_i____1(__attribute__ ((unused,unused)) int (*__anonymous_object9)(__attribute__ ((unused)) int (*__anonymous_object10)(__attribute__ ((unused,unused)) int __anonymous_object11)));
+int __tpr7__Fi_PFi_PFi_i____1(__attribute__ ((unused,unused)) int (*__anonymous_object7)(__attribute__ ((unused)) int (*__anonymous_object8)(__attribute__ ((unused,unused)) int __anonymous_object9)));
 int __ad__Fi___1(){
     int ___retval_ad__i_1;
@@ -285,5 +279,5 @@
     ((void)sizeof(__attribute__ ((unused,unused,unused)) int (*)[10]));
     ((void)sizeof(__attribute__ ((unused,unused,unused)) int ()));
-    struct __attribute__ ((unused)) __anonymous4 {
+    __attribute__ ((unused)) struct __anonymous4 {
         int __i__i_2;
     };
@@ -320,16 +314,16 @@
     ((void)sizeof(enum __anonymous5 ));
 }
-int __apd1__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) int *__anonymous_object12, __attribute__ ((unused,unused,unused)) int *__anonymous_object13);
-int __apd2__Fi_PPiPPi__1(__attribute__ ((unused,unused,unused,unused)) int **__anonymous_object14, __attribute__ ((unused,unused,unused,unused)) int **__anonymous_object15);
-int __apd3__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) int *__anonymous_object16, __attribute__ ((unused,unused,unused)) int *__anonymous_object17);
-int __apd4__Fi_PFi__PFi____1(__attribute__ ((unused,unused,unused)) int (*__anonymous_object18)(), __attribute__ ((unused,unused,unused)) int (*__anonymous_object19)());
-int __apd5__Fi_PFi_i_PFi_i___1(__attribute__ ((unused,unused,unused)) int (*__anonymous_object20)(__attribute__ ((unused)) int __anonymous_object21), __attribute__ ((unused,unused,unused)) int (*__anonymous_object22)(__attribute__ ((unused)) int __anonymous_object23));
-int __apd6__Fi_PFi__PFi____1(__attribute__ ((unused,unused,unused)) int (*__anonymous_object24)(), __attribute__ ((unused,unused,unused)) int (*__anonymous_object25)());
-int __apd7__Fi_PFi_i_PFi_i___1(__attribute__ ((unused,unused,unused)) int (*__anonymous_object26)(__attribute__ ((unused)) int __anonymous_object27), __attribute__ ((unused,unused,unused)) int (*__anonymous_object28)(__attribute__ ((unused)) int __anonymous_object29));
+int __apd1__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) int *__anonymous_object10, __attribute__ ((unused,unused,unused)) int *__anonymous_object11);
+int __apd2__Fi_PPiPPi__1(__attribute__ ((unused,unused,unused,unused)) int **__anonymous_object12, __attribute__ ((unused,unused,unused,unused)) int **__anonymous_object13);
+int __apd3__Fi_PiPi__1(__attribute__ ((unused,unused,unused)) int *__anonymous_object14, __attribute__ ((unused,unused,unused)) int *__anonymous_object15);
+int __apd4__Fi_PFi__PFi____1(__attribute__ ((unused,unused,unused)) int (*__anonymous_object16)(), __attribute__ ((unused,unused,unused)) int (*__anonymous_object17)());
+int __apd5__Fi_PFi_i_PFi_i___1(__attribute__ ((unused,unused,unused)) int (*__anonymous_object18)(__attribute__ ((unused)) int __anonymous_object19), __attribute__ ((unused,unused,unused)) int (*__anonymous_object20)(__attribute__ ((unused)) int __anonymous_object21));
+int __apd6__Fi_PFi__PFi____1(__attribute__ ((unused,unused,unused)) int (*__anonymous_object22)(), __attribute__ ((unused,unused,unused)) int (*__anonymous_object23)());
+int __apd7__Fi_PFi_i_PFi_i___1(__attribute__ ((unused,unused,unused)) int (*__anonymous_object24)(__attribute__ ((unused)) int __anonymous_object25), __attribute__ ((unused,unused,unused)) int (*__anonymous_object26)(__attribute__ ((unused)) int __anonymous_object27));
 struct Vad {
-    __attribute__ ((unused)) int __anonymous_object30;
-    __attribute__ ((unused,unused)) int *__anonymous_object31;
-    __attribute__ ((unused,unused)) int __anonymous_object32[((long unsigned int )10)];
-    __attribute__ ((unused,unused)) int (*__anonymous_object33)();
+    __attribute__ ((unused)) int __anonymous_object28;
+    __attribute__ ((unused,unused)) int *__anonymous_object29;
+    __attribute__ ((unused,unused)) int __anonymous_object30[((long unsigned int )10)];
+    __attribute__ ((unused,unused)) int (*__anonymous_object31)();
 };
 static inline void ___constructor__F_P4sVad_autogen___1(struct Vad *___dst__P4sVad_1);