summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/tools/Tpm.pm1
-rwxr-xr-xMaster/common.sh45
-rwxr-xr-xMaster/utils.sh1
3 files changed, 26 insertions, 21 deletions
diff --git a/Build/tools/Tpm.pm b/Build/tools/Tpm.pm
index 0380c7d75e9..48f3dac62bb 100644
--- a/Build/tools/Tpm.pm
+++ b/Build/tools/Tpm.pm
@@ -81,6 +81,7 @@ $Editor = ($^O =~ m/win32/i ? "notepad": "vi");
"mips-irix",
"powerpc-aix",
"powerpc-darwin",
+ "powerpc-linux",
"sparc-solaris",
"sparc-linux",
"win32",
diff --git a/Master/common.sh b/Master/common.sh
index 74769eb5fd4..c69a5cb3f77 100755
--- a/Master/common.sh
+++ b/Master/common.sh
@@ -41,14 +41,14 @@ setvars()
p_i386_linux_n='Intel x86 with GNU/Linux'
p_i386_solaris_n='Intel x86 with Sun Solaris'
p_mips_irix_n='SGI IRIX'
- p_powerpc_aix_n='PowerPC AIX'
- p_powerpc_darwin_n='Mac OSX/Darwin 5.3 or 6.*'
+ p_powerpc_aix_n='PowerPC with AIX'
+ p_powerpc_darwin_n='PowerPC with MacOSX/Darwin'
+ p_powerpc_linux_n='PowerPC with GNU/Linux'
p_sparc_linux_n='Sparc with GNU/Linux'
p_sparc_solaris_n='Sparc with Solaris'
p_win32_n='Windows'
p_x86_64_linux_n='Intel x86_64 with GNU/Linux'
-
iden_1=a
iden_2=b
iden_3=c
@@ -303,7 +303,6 @@ this_platform_set()
if test -n "$this_system"; then
eval p_${this_system}_s=true
size=0
- eval size=\`expr $size + \$p_${this_system}_du\`
eval this_platform_n=\$p_${this_system}_n
eval this_platform_fn=\$p_${this_system}_fn
all_systems_ns=1
@@ -574,7 +573,7 @@ menu_this_platform()
while true; do
cls
textvar_show screen_5; echo
- case `getopt NABCDEFGHIJKLMOPRQ 'Select the platform you are currently on'` in
+ case `getopt NABCDEFGHIJKLMOPRSQ 'Select the platform you are currently on'` in
N) this_system=''; this_platform_set ;;
A) this_system=i386_linux; this_platform_set ;;
B) this_system=win32; this_platform_set ;;
@@ -583,15 +582,18 @@ menu_this_platform()
E) this_system=alpha_linux; this_platform_set ;;
F) this_system=mips_irix; this_platform_set ;;
G) this_system=powerpc_aix; this_platform_set ;;
- H) this_system=hppa_hpux; this_platform_set ;;
- I) this_system=sparc_solaris; this_platform_set ;;
- J) this_system=i386_solaris; this_platform_set ;;
- K) this_system=i386_freebsd; this_platform_set ;;
- L) this_system=i386_openbsd; this_platform_set ;;
- M) this_system=i386_cygwin; this_platform_set ;;
+ H) this_system=powerpc_linux; this_platform_set ;;
+ I) this_system=hppa_hpux; this_platform_set ;;
+ J) this_system=sparc_linux; this_platform_set ;;
+ K) this_system=sparc_solaris; this_platform_set ;;
+ L) this_system=i386_solaris; this_platform_set ;;
+ M) this_system=i386_freebsd; this_platform_set ;;
# N above
- O) this_system=x86_64_linux; this_platform_set ;;
- P) this_system=sparc_linux; this_platform_set ;;
+ O) this_system=i386_openbsd; this_platform_set ;;
+ P) this_system=i386_cygwin; this_platform_set ;;
+ # QR below
+ S) this_system=x86_64_linux; this_platform_set ;;
+ #
Q) exit_on_confirm ;;
R) total_stat; return ;;
esac
@@ -851,14 +853,15 @@ screen_5='Current platform: $this_platform_n
<E> $p_alpha_linux_n
<F> $p_mips_irix_n
<G> $p_powerpc_aix_n
- <H> $p_hppa_hpux_n
- <I> $p_sparc_solaris_n
- <J> $p_i386_solaris_n
- <K> $p_i386_freebsd_n
- <L> $p_i386_openbsd_n
- <M> $p_i386_cygwin_n
- <O> $p_x86_64_linux_n
- <P> $p_sparc_linux_n
+ <H> $p_powerpc_linux_n
+ <I> $p_hppa_hpux_n
+ <J> $p_sparc_linux_n
+ <K> $p_sparc_solaris_n
+ <L> $p_i386_solaris_n
+ <M> $p_i386_freebsd_n
+ <O> $p_i386_openbsd_n
+ <P> $p_i386_cygwin_n
+ <S> $p_x86_64_linux_n
<R> return to main menu
<Q> quit
diff --git a/Master/utils.sh b/Master/utils.sh
index b8b327b3cb0..e611e7f6a07 100755
--- a/Master/utils.sh
+++ b/Master/utils.sh
@@ -432,6 +432,7 @@ platform_guess()
mips-irix*) Sys=mips_irix;;
powerpc-aix*) Sys=powerpc_aix;;
powerpc-*darwin*) Sys=powerpc_darwin;;
+ powerpc-*linux*) Sys=powerpc_linux;;
sparc-solaris*) Sys=sparc_solaris;;
sparc*-linux*) Sys=sparc_linux;;
# *86-openbsd*) Sys=i386_openbsd;;