Index: src/tests/.expect/32/declarationSpecifier.txt
===================================================================
--- src/tests/.expect/32/declarationSpecifier.txt	(revision 52c14b38a7806747cf75c7dbf3ad4e40b240a03f)
+++ src/tests/.expect/32/declarationSpecifier.txt	(revision 4fbdd1e3c0c922ed23e16bac1a2d2fce7bfe0bcb)
@@ -1,7 +1,7 @@
-__attribute__ ((__malloc__,__nothrow__,__leaf__)) extern void *malloc(unsigned int __size);
+__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned int __size);
 __attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr);
-__attribute__ ((__noreturn__,__nothrow__,__leaf__)) extern void abort(void);
-__attribute__ ((__nonnull__(1),__nothrow__,__leaf__)) extern int atexit(void (*__func)(void));
-__attribute__ ((__noreturn__,__nothrow__,__leaf__)) extern void exit(int __status);
+__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void);
+__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern int atexit(void (*__func)(void));
+__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(int __status);
 extern int printf(const char *__restrict __format, ...);
 volatile const short __x1__CVs_1;
@@ -629,9 +629,9 @@
 }
 static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return __main__Fi_iPPCc__1(argc, argv); }
-__attribute__ ((__malloc__,__nothrow__,__leaf__)) extern void *malloc(unsigned int __size);
+__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned int __size);
 __attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr);
-__attribute__ ((__noreturn__,__nothrow__,__leaf__)) extern void abort(void);
-__attribute__ ((__nonnull__(1),__nothrow__,__leaf__)) extern int atexit(void (*__func)(void));
-__attribute__ ((__noreturn__,__nothrow__,__leaf__)) extern void exit(int __status);
+__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void);
+__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern int atexit(void (*__func)(void));
+__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(int __status);
 extern int printf(const char *__restrict __format, ...);
 static inline int invoke_main(int argc, char **argv, char **envp);
Index: src/tests/.expect/32/extension.txt
===================================================================
--- src/tests/.expect/32/extension.txt	(revision 52c14b38a7806747cf75c7dbf3ad4e40b240a03f)
+++ src/tests/.expect/32/extension.txt	(revision 4fbdd1e3c0c922ed23e16bac1a2d2fce7bfe0bcb)
@@ -1,7 +1,7 @@
-__attribute__ ((__malloc__,__nothrow__,__leaf__)) extern void *malloc(unsigned int __size);
+__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned int __size);
 __attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr);
-__attribute__ ((__noreturn__,__nothrow__,__leaf__)) extern void abort(void);
-__attribute__ ((__nonnull__(1),__nothrow__,__leaf__)) extern int atexit(void (*__func)(void));
-__attribute__ ((__noreturn__,__nothrow__,__leaf__)) extern void exit(int __status);
+__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void);
+__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern int atexit(void (*__func)(void));
+__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(int __status);
 extern int printf(const char *__restrict __format, ...);
 __extension__ int __a__i_1;
@@ -77,4 +77,7 @@
     __B__C2eE_1,
 };
+__extension__ int __f__Fi___1();
+__extension__ int i;
+__extension__ int j;
 __extension__ int __fred__Fi_i__1(int __p__i_1){
     int ___retval_fred__i_1;
@@ -83,4 +86,7 @@
         __extension__ int __b__i_2;
         __extension__ int __c__i_2;
+        __extension__ int *__x__Pi_2;
+        __extension__ int *__y__Pi_2;
+        __extension__ int *__z__Pi_2;
     };
     int __i__i_2 = ((int )(__extension__ __a__i_1+__extension__ 3));
@@ -94,4 +100,7 @@
     ((void)((_tmp_cp_ret0=__extension__ __fred__Fi_i__1(3)) , _tmp_cp_ret0));
     ((void)((*((int *)(&_tmp_cp_ret0)))) /* ^?{} */);
+    __extension__ int __mary__Fi_i__2(int __p__i_2){
+        int ___retval_mary__i_2;
+    }
     ((void)__extension__ sizeof(3));
     ((void)__extension__ (((int )(3!=((int )0))) || ((int )(4!=((int )0)))));
Index: src/tests/.expect/32/gccExtensions.txt
===================================================================
--- src/tests/.expect/32/gccExtensions.txt	(revision 52c14b38a7806747cf75c7dbf3ad4e40b240a03f)
+++ src/tests/.expect/32/gccExtensions.txt	(revision 4fbdd1e3c0c922ed23e16bac1a2d2fce7bfe0bcb)
@@ -1,7 +1,7 @@
-__attribute__ ((__malloc__,__nothrow__,__leaf__)) extern void *malloc(unsigned int __size);
+__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned int __size);
 __attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr);
-__attribute__ ((__noreturn__,__nothrow__,__leaf__)) extern void abort(void);
-__attribute__ ((__nonnull__(1),__nothrow__,__leaf__)) extern int atexit(void (*__func)(void));
-__attribute__ ((__noreturn__,__nothrow__,__leaf__)) extern void exit(int __status);
+__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void);
+__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern int atexit(void (*__func)(void));
+__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(int __status);
 extern int printf(const char *__restrict __format, ...);
 extern int __x__i_1 asm ( "xx" );
@@ -166,9 +166,9 @@
 }
 static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return __main__Fi_iPPCc__1(argc, argv); }
-__attribute__ ((__malloc__,__nothrow__,__leaf__)) extern void *malloc(unsigned int __size);
+__attribute__ ((__nothrow__,__leaf__,__malloc__)) extern void *malloc(unsigned int __size);
 __attribute__ ((__nothrow__,__leaf__)) extern void free(void *__ptr);
-__attribute__ ((__noreturn__,__nothrow__,__leaf__)) extern void abort(void);
-__attribute__ ((__nonnull__(1),__nothrow__,__leaf__)) extern int atexit(void (*__func)(void));
-__attribute__ ((__noreturn__,__nothrow__,__leaf__)) extern void exit(int __status);
+__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void abort(void);
+__attribute__ ((__nothrow__,__leaf__,__nonnull__(1))) extern int atexit(void (*__func)(void));
+__attribute__ ((__nothrow__,__leaf__,__noreturn__)) extern void exit(int __status);
 extern int printf(const char *__restrict __format, ...);
 static inline int invoke_main(int argc, char **argv, char **envp);