From 5ae5119cafbc6f273a34b016d9a0237169fefbf9 Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Fri, 19 Sep 2003 21:54:37 +0000 Subject: [PATCH] added hppa (parisc) architecture definitions git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1461 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 2 ++ architecture/hppa/archtest.out | 5 ++++ architecture/hppa/archtest.sh | 12 ++++++++ architecture/hppa/config.hlp | 27 ++++++++++++++++++ architecture/hppa/config.in | 37 +++++++++++++++++++++++++ architecture/hppa/gcc-options | 5 ++++ architecture/hppa/kernel.conf.m4 | 7 +++++ architecture/hppa/preconfig.in | 24 ++++++++++++++++ package/base/linux24/lx_config.sh | 2 +- 9 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 architecture/hppa/archtest.out create mode 100644 architecture/hppa/archtest.sh create mode 100644 architecture/hppa/config.hlp create mode 100644 architecture/hppa/config.in create mode 100644 architecture/hppa/gcc-options create mode 100644 architecture/hppa/kernel.conf.m4 create mode 100644 architecture/hppa/preconfig.in diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 7572ec10e..da89d88b9 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -4,6 +4,8 @@ - Jan Veninga: linux24-header-cross must also be latest linux version Build-Target does not build broken-flagged packages - Alejandro Mery: /lib/*.{a,la} -> /usr/lib/, and a related fix to ncurses + - added hppa (parisc) architecture definitions + - sparc kernel and config work *) 2003-09-18 (2.0.0-rc1 - 2.0.0-rc2) diff --git a/architecture/hppa/archtest.out b/architecture/hppa/archtest.out new file mode 100644 index 000000000..bcd85df7c --- /dev/null +++ b/architecture/hppa/archtest.out @@ -0,0 +1,5 @@ +arch_sizeof_short=2 +arch_sizeof_int=4 +arch_sizeof_long=4 +arch_sizeof_long_long=8 +arch_bigendian=yes diff --git a/architecture/hppa/archtest.sh b/architecture/hppa/archtest.sh new file mode 100644 index 000000000..da4b0864b --- /dev/null +++ b/architecture/hppa/archtest.sh @@ -0,0 +1,12 @@ + +case "$ROCKCFG_HPPA_BITS" in + 32) + arch_machine=hppa + arch_target="hppa-unknown-linux-gnu" + arch_sizeof_char_p=4 ;; + 64) + arch_machine=hppa + arch_target="hppa64-unknown-linux-gnu" + arch_sizeof_char_p=8 ;; +esac + diff --git a/architecture/hppa/config.hlp b/architecture/hppa/config.hlp new file mode 100644 index 000000000..e405c92bf --- /dev/null +++ b/architecture/hppa/config.hlp @@ -0,0 +1,27 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/architecture/sparc/config.hlp +# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. A copy of the GNU General Public +# License can be found at Documentation/COPYING. +# +# Many people helped and are helping developing ROCK Linux. Please +# have a look at http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +ROCKCFG_HPPA_BITS + Controls whether to generate 32-bit or 64-bit code. + +ROCKCFG_HPPA_OPT + Please select the CPU you want to optimise for. diff --git a/architecture/hppa/config.in b/architecture/hppa/config.in new file mode 100644 index 000000000..64659c4e6 --- /dev/null +++ b/architecture/hppa/config.in @@ -0,0 +1,37 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/architecture/sparc/config.in +# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. A copy of the GNU General Public +# License can be found at Documentation/COPYING. +# +# Many people helped and are helping developing ROCK Linux. Please +# have a look at http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +# Advanced SPARC options and 64 bit work by Rene Rebe + +# General architecture switch +choice ROCKCFG_HPPA_BITS 32 \ + 32 "build 32 bit code" \ + 64 "build 64 bit code" + +# Now the optimisations that result from the options above +choice ROCKCFG_HPPA_OPT generic \ + generic "No special optimisation" + +if [ "$ROCKCFG_HPPA_OPT" != generic ] ; then + ROCKCFG_ID="$ROCKCFG_ID-$ROCKCFG_HPPA_OPT" +fi + diff --git a/architecture/hppa/gcc-options b/architecture/hppa/gcc-options new file mode 100644 index 000000000..dba8f623a --- /dev/null +++ b/architecture/hppa/gcc-options @@ -0,0 +1,5 @@ + +if [ "$ROCKCFG_SPARC_OPT" != "generic" ] ; then + var_append GCC_WRAPPER_INSERT " " "-mcpu=$ROCKCFG_SPARC_OPT" +fi + diff --git a/architecture/hppa/kernel.conf.m4 b/architecture/hppa/kernel.conf.m4 new file mode 100644 index 000000000..f7a637738 --- /dev/null +++ b/architecture/hppa/kernel.conf.m4 @@ -0,0 +1,7 @@ + +# TO BE DONE + +include(`kernel-common.conf') +include(`kernel-scsi.conf') +include(`kernel-net.conf') +include(`kernel-fs.conf') diff --git a/architecture/hppa/preconfig.in b/architecture/hppa/preconfig.in new file mode 100644 index 000000000..cd22c69de --- /dev/null +++ b/architecture/hppa/preconfig.in @@ -0,0 +1,24 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/architecture/sparc/preconfig.in +# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. A copy of the GNU General Public +# License can be found at Documentation/COPYING. +# +# Many people helped and are helping developing ROCK Linux. Please +# have a look at http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +CFGTEMP_ARCHLIST="$CFGTEMP_ARCHLIST hppa Generic_HPPA_Workstations" + diff --git a/package/base/linux24/lx_config.sh b/package/base/linux24/lx_config.sh index cdd5c2122..cd81922ed 100644 --- a/package/base/linux24/lx_config.sh +++ b/package/base/linux24/lx_config.sh @@ -25,7 +25,7 @@ archdir="$base/download/$repository/linux$treever" srctar="linux-${vanilla_ver}.tar.bz2" lx_cpu=`echo "$arch_machine" | sed -e s/x86/i386/ \ - -e s/i.86/i386/ -e s/powerpc/ppc/` + -e s/i.86/i386/ -e s/powerpc/ppc/ -e s/hppa/parisc/` [ $arch = sparc -a "$ROCKCFG_SPARC_64BIT_KERNEL" = 1 ] && \ lx_cpu=sparc64