adjust for building gcc8 and gcc9

cppdefault.cc was called cppdefault.c back in those days

Signed-off-by: Khem Raj <[email protected]>

Author: kraj

toolchain-baremetal.sh

@@ -87,7 +87,7 @@ sysroot=$top/sysroot
 
 finish() {
   if [ $gcc_patched ]; then
-    mv $src/$gccv/gcc/cppdefault.cc.orig $src/$gccv/gcc/cppdefault.cc
+    mv $src/$gccv/gcc/cppdefault.$ext.orig $src/$gccv/gcc/cppdefault.$ext
   fi
 }
 
@@ -104,8 +104,8 @@ prep_gcc () {
 
 prep_src () {
   if [ $gcc_patched ]; then
-    cp $src/$gccv/gcc/cppdefault.cc $src/$gccv/gcc/cppdefault.cc.orig
-    sed -i -e 's/\<STANDARD_STARTFILE_PREFIX_2\>//g' $src/$gccv/gcc/cppdefault.cc
+    cp $src/$gccv/gcc/cppdefault.$ext $src/$gccv/gcc/cppdefault.$ext.orig
+    sed -i -e 's/\<STANDARD_STARTFILE_PREFIX_2\>//g' $src/$gccv/gcc/cppdefault.$ext
   fi
   cd $src/$binutilsv
   for d in . bfd binutils gas gold gprof ld libctf opcodes; do
@@ -116,7 +116,13 @@ prep_src () {
   done
 }
 
-eval grep '\<STANDARD_STARTFILE_PREFIX_2\>' $src/$gccv/gcc/cppdefault.cc >& /dev/null
+if [ -e $src/$gccv/gcc/cppdefault.c ]; then
+  ext=c
+elif [ -e $src/$gccv/gcc/cppdefault.cc ]; then
+  ext=cc
+fi
+
+eval grep '\<STANDARD_STARTFILE_PREFIX_2\>' $src/$gccv/gcc/cppdefault.$ext >& /dev/null
 gcc_patched=$?
 
 # uncomment if want to generate debuggable toolchain components.

toolchain-glibc.sh

@@ -147,7 +147,7 @@ check_return () {
 
 finish() {
   if [ $gcc_patched ]; then
-    mv $src/$gccv/gcc/cppdefault.cc.orig $src/$gccv/gcc/cppdefault.cc
+    mv $src/$gccv/gcc/cppdefault.$ext.orig $src/$gccv/gcc/cppdefault.$ext
   fi
   if [ $glibc_patched ]; then
     mv $src/$libcv/elf/readlib.c.orig $src/$libcv/elf/readlib.c
@@ -167,8 +167,8 @@ prep_gcc () {
 
 prep_src () {
   if [ $gcc_patched ]; then
-    cp $src/$gccv/gcc/cppdefault.cc $src/$gccv/gcc/cppdefault.cc.orig
-    sed -i -e 's/\<STANDARD_STARTFILE_PREFIX_2\>//g' $src/$gccv/gcc/cppdefault.cc
+    cp $src/$gccv/gcc/cppdefault.$ext $src/$gccv/gcc/cppdefault.$ext.orig
+    sed -i -e 's/\<STANDARD_STARTFILE_PREFIX_2\>//g' $src/$gccv/gcc/cppdefault.$ext
   fi
   if [ $glibc_patched ]; then
     cp $src/$libcv/elf/readlib.c $src/$libcv/elf/readlib.c.orig
@@ -183,7 +183,13 @@ prep_src () {
   #done
 }
 
-eval grep '\<STANDARD_STARTFILE_PREFIX_2\>' $src/$gccv/gcc/cppdefault.cc >& /dev/null
+if [ -e $src/$gccv/gcc/cppdefault.c ]; then
+  ext=c
+elif [ -e $src/$gccv/gcc/cppdefault.cc ]; then
+  ext=cc
+fi
+
+eval grep '\<STANDARD_STARTFILE_PREFIX_2\>' $src/$gccv/gcc/cppdefault.$ext >& /dev/null
 gcc_patched=$?
 eval grep '\<OECORE_KNOWN_INTERPRETER_NAMES\>' $src/$libcv/elf/readlib.c >& /dev/null
 glibc_patched=$?

toolchain-musl.sh

@@ -146,7 +146,7 @@ check_return () {
 
 finish() {
   if [ $gcc_patched ]; then
-    mv $src/$gccv/gcc/cppdefault.cc.orig $src/$gccv/gcc/cppdefault.cc
+    mv $src/$gccv/gcc/cppdefault.$ext.orig $src/$gccv/gcc/cppdefault.$ext
   fi
 }
 
@@ -163,8 +163,8 @@ prep_gcc () {
 
 prep_src () {
   if [ $gcc_patched ]; then
-    cp $src/$gccv/gcc/cppdefault.cc $src/$gccv/gcc/cppdefault.cc.orig
-    sed -i -e 's/\<STANDARD_STARTFILE_PREFIX_2\>//g' $src/$gccv/gcc/cppdefault.cc
+    cp $src/$gccv/gcc/cppdefault.$ext $src/$gccv/gcc/cppdefault.$ext.orig
+    sed -i -e 's/\<STANDARD_STARTFILE_PREFIX_2\>//g' $src/$gccv/gcc/cppdefault.$ext
   fi
 #  cd $src/$binutilsv
 #  for d in . bfd binutils gas gold gprof ld libctf opcodes; do
@@ -175,7 +175,12 @@ prep_src () {
 #  done
 }
 
-eval grep '\<STANDARD_STARTFILE_PREFIX_2\>' $src/$gccv/gcc/cppdefault.cc >& /dev/null
+if [ -e $src/$gccv/gcc/cppdefault.c ]; then
+  ext=c
+elif [ -e $src/$gccv/gcc/cppdefault.cc ]; then
+  ext=cc
+fi
+eval grep '\<STANDARD_STARTFILE_PREFIX_2\>' $src/$gccv/gcc/cppdefault.$ext >& /dev/null
 gcc_patched=$?
 
 #if [ $download_src = "yes" ]; then