Aim for conformance when called as c89/c99 (#257299)

3 files changed, 10 insertions, 16 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index dee34d1f7b8c..c912fd4d999c 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -41,8 +41,8 @@ AUX 4.3.2/gcc-4.3.2-softfloat.patch 2800 RMD160 91babb0f61511d8936c4e1dd201c710d
 AUX awk/fixlafiles.awk 7807 RMD160 749402c9c0a0f1e8755067c0e001f69d73edb09f SHA1 5fc91ce11eb93e989ae64470dba602fe534ac409 SHA256 3cae4890a295adef50c6cf8a7e14d1be4e7a2356479c073e5c29433c3cdf9c5c
 AUX awk/fixlafiles.awk-no_gcc_la 8614 RMD160 b2eac0355af83ea2fee02222d1179b23d062ddc2 SHA1 b65717ce21049ba04a4628ceeb662f69797ada40 SHA256 98e1e669906bd5928b695fdcfbf8e56618f12ce9311d31ce1b11dff68d35bb6f
 AUX awk/scanforssp.awk 5830 RMD160 43a8c09e4e16d9a78ab4d6263e74a1850f12eb9b SHA1 1d2756f5e75532a7068357404c39081a3c9d9a68 SHA256 236a2a7eea1ba540ca3be82b0fe2cdefd9ac76b061440918ffe52664edbbb98a
-AUX c89 428 RMD160 1030ea2af20b5bb4c2b07668230b3e752ddab035 SHA1 c70119483d984a7c2300947679663fffd5df1419 SHA256 999b40b67f690638f601d76b756d529dd40a4325f42dfd9fd2e629ad0a91947c
-AUX c99 451 RMD160 b0e058d8ad3e2eac5f0e7b6e85583de5b1c4be93 SHA1 939df3f67e73790ae785fddb86a41b3dcf87686a SHA256 474357dd9ce161b6db3ce88a5c0bd1e536a0f40d66a86894d48abe30226ee193
+AUX c89 412 RMD160 2b54e526a76ff0b2e0e8f4f7f9d6949ac45806fa SHA1 6f6ed5affc4ae906c5d8cbdda557d5bbf683d861 SHA256 29ad5dd697135c2892067e780447894dc1cd071708157e46d21773ab99c5022c
+AUX c99 446 RMD160 04ecc9ef9b7a1fd525768955ff6a67fc0d5a17f7 SHA1 312b3b47490d9f62656706908112f9331bc509a4 SHA256 057b348cf5be9b4fb9db99a4549f6433c89d21e5f91dc5e46b0b4dc6b70432f5
 AUX fix_libtool_files.sh 1735 RMD160 5035cd4a9995ea6207a8de95815921c3939395bd SHA1 57cd1babab4c6b142dd8cc58b36943442ff2af13 SHA256 b8d86b1db9453dff4c62b3467887bf1e04ecb483120185102122bda2581ed3f5
 AUX gcc-configure-LANG.patch 2052 RMD160 91f5b90600dfccb10c4e2308a5a1485275fdfeee SHA1 56ecd1d6f2e4bd0b35ac108be72a4f6f60212c38 SHA256 63de6d2dcfe14f21d147abeb1390405b9220c03f8e968f482d4b4c1cf279c88b
 AUX gcc-configure-texinfo.patch 337 RMD160 d0e872a9f0ccb5ab51d10f129acd7a19d76a7b75 SHA1 7e267fac540175ce848e563539db8c951cab557b SHA256 74b73a7ecec2d88889876b4db480cd173632f49d5396bb8e5b3c93673f9b5b98
@@ -143,7 +143,7 @@ MISC metadata.xml 1478 RMD160 3c774d5ceb9dc77c4f164f1b808f8d4812feb06e SHA1 2784
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkmI2kEACgkQiqiDRvmkBmJ5hgCfd+FsEIxSICLguUySuYcPy//V
-EMgAn3GHEZoCLvlaPV9PvJzPWRlDy/C4
-=qkMq
+iEYEARECAAYFAkmJ3KUACgkQwnQyISwouHyVCwCbBV21WWlrzAUzi4yoz2MjPHUb
+95YAn3KBgjy7B4CW6TVKfDYhyHkap0Sw
+=l5Yw
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc/files/c89 b/sys-devel/gcc/files/c89
index d0a3c1e634ee..cee0325f50f1 100755
--- a/sys-devel/gcc/files/c89
+++ b/sys-devel/gcc/files/c89
@@ -6,18 +6,15 @@
 # 	-std=c89
 # 	-std=iso9899:1990
 
-extra_flag=-std=c89
-
 for i; do
     case "$i" in
 	-ansi|-std=c89|-std=iso9899:1990)
-	    extra_flag=
 	    ;;
 	-std=*)
-	    echo >&2 "`basename $0` called with non ANSI/ISO C option $i"
+	    echo >&2 "`basename $0` called with non ANSI/ISO C90 option $i"
 	    exit 1
 	    ;;
     esac
 done
 
-exec gcc $extra_flag ${1+"$@"}
+exec gcc -std=c89 -pedantic -U_FORTIFY_SOURCE "$@"
diff --git a/sys-devel/gcc/files/c99 b/sys-devel/gcc/files/c99
index 2edf5cd2f00f..c9542095e385 100755
--- a/sys-devel/gcc/files/c99
+++ b/sys-devel/gcc/files/c99
@@ -7,18 +7,15 @@
 # 	-std=iso9899:1999
 # 	-std=iso9899:199x
 
-extra_flag=-std=c99
-
 for i; do
     case "$i" in
 	-std=c9[9x]|-std=iso9899:199[9x])
-	    extra_flag=
 	    ;;
-	-std=*)
-	    echo >&2 "`basename $0` called with non ANSI/ISO C option $i"
+	-ansi|-std=*)
+	    echo >&2 "`basename $0` called with non ANSI/ISO C99 option $i"
 	    exit 1
 	    ;;
     esac
 done
 
-exec gcc $extra_flag ${1+"$@"}
+exec gcc -std=c99 -pedantic -U_FORTIFY_SOURCE ${1+"$@"}