Use newlib_* instead of gcc3newlib_* for values from setup.*.

1 files changed, 6 insertions, 6 deletions

diff --git a/scripts/gcc3newlib/mkspec.in b/scripts/gcc3newlib/mkspec.in
index 3a611d1e06..044a1575d5 100644
--- a/scripts/gcc3newlib/mkspec.in
+++ b/scripts/gcc3newlib/mkspec.in
@@ -54,15 +54,15 @@ patchn=`expr $patchn + 1`
 PATCH1="Patch${patchn}: gcc-${gcc_version}-rtems-${gcc_patch_version}.diff"
 fi
 
-if test -n "${gcc3newlib_patch_version}"; then
+if test -n "${newlib_patch_version}"; then
 patchn=`expr $patchn + 1`
-PATCH3="Patch${patchn}: newlib-${gcc3newlib_version}-rtems-${gcc3newlib_patch_version}.diff"
+PATCH3="Patch${patchn}: newlib-${newlib_version}-rtems-${newlib_patch_version}.diff"
 fi
 
 # note that the variables in the gcc3newlib directory are actually the same
 sed -e "s,@PATCH1\@,${PATCH1}," \
     -e "s,@PATCH3\@,${PATCH3}," \
-    -e "s%@Release\@%${gcc3newlib_rpm_release}%g" \
+    -e "s%@Release\@%${newlib_rpm_release}%g" \
     -e "s%@target_alias\@%${target_alias}%g" \
     -e "s%@prefix\@%@prefix@%g" \
     -e "s,@rpmprefix\@,@rpmprefix@,g" \
@@ -72,7 +72,7 @@ sed -e "s,@PATCH1\@,${PATCH1}," \
     -e "s%@gcc_version\@%${gcc_version}%g" \
     -e "s%@gcc_patch_version\@%${gcc_patch_version}%g" \
     -e "s%@gcc_suffix\@%${gcc_suffix}%g" \
-    -e "s%@newlib_version\@%${gcc3newlib_version}%g" \
-    -e "s%@newlib_patch_version\@%${gcc3newlib_patch_version}%g" \
-    -e "s%@newlib_suffix\@%${gcc3newlib_suffix}%g" \
+    -e "s%@newlib_version\@%${newlib_version}%g" \
+    -e "s%@newlib_patch_version\@%${newlib_patch_version}%g" \
+    -e "s%@newlib_suffix\@%${newlib_suffix}%g" \
 < ${specsrc}