riscv32: Drop any remaining mentions

* I added this early on, but to be honest, any interesting
  workstation class hardware would be riscv64.
* Since riscv32 is mostly embedded or low power, just drop.

Change-Id: Id36274c882c46e766268f2ab53eb1bd5f95227be
Reviewed-on: https://review.haiku-os.org/c/1352
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
Alexander von Gluck IV
2019-04-04 13:23:32 +00:00
committed by Alex von Gluck IV
parent 7a180033de
commit c59cde3d69
15 changed files with 2 additions and 229 deletions
+1 -3
View File
@@ -14,7 +14,7 @@ from pprint import pprint
parser = argparse.ArgumentParser(description='Configure a build of Haiku') parser = argparse.ArgumentParser(description='Configure a build of Haiku')
parser.add_argument('--target-arch', nargs=1, parser.add_argument('--target-arch', nargs=1,
help='Target architectures. First provided is primary.', type=str, action='append', help='Target architectures. First provided is primary.', type=str, action='append',
choices=('x86_gcc2', 'x86', 'x86_64', 'ppc', 'm68k', 'arm', 'arm64', 'riscv32', 'riscv64')) choices=('x86_gcc2', 'x86', 'x86_64', 'ppc', 'm68k', 'arm', 'arm64', 'riscv64'))
parser.add_argument('--bootstrap', nargs=3, parser.add_argument('--bootstrap', nargs=3,
help='Prepare for a bootstrap build. No pre-built packages will be used, instead they will be built from the sources (in several phases).', help='Prepare for a bootstrap build. No pre-built packages will be used, instead they will be built from the sources (in several phases).',
metavar=('<haikuporter>','<haikuports.cross>', '<haikuports>')) metavar=('<haikuporter>','<haikuports.cross>', '<haikuports>'))
@@ -129,8 +129,6 @@ def triplet_lookup(arch):
return "m68k-unknown-haiku" return "m68k-unknown-haiku"
elif arch == "arm": elif arch == "arm":
return "arm-unknown-haiku" return "arm-unknown-haiku"
elif arch == "riscv32":
return "riscv32-unknown-haiku"
elif arch == "riscv64": elif arch == "riscv64":
return "riscv64-unknown-haiku" return "riscv64-unknown-haiku"
else: else:
-13
View File
@@ -302,19 +302,6 @@ rule KernelArchitectureSetup architecture
Exit "HAIKU_NASM not set. Please re-run configure." ; Exit "HAIKU_NASM not set. Please re-run configure." ;
} }
case riscv32 :
HAIKU_BOOT_PLATFORM ?= u-boot ;
HAIKU_BOOT_TARGETS += u-boot ;
HAIKU_BOOT_SDIMAGE_SIZE ?= 128 ;
# SOC's like allwinner need an offset to skip the hardcoded initial loader
HAIKU_BOOT_SDIMAGE_BEGIN = 40950 ; # 512-byte sectors (divisible by 63)
HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ;
# offset in floppy image (>= sizeof(haiku_loader))
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 192 ; # in kB - unused yet
HAIKU_BOOT_LOADER_BASE ?= 0x1000000 ;
case riscv64 : case riscv64 :
HAIKU_BOOT_PLATFORM ?= u-boot ; HAIKU_BOOT_PLATFORM ?= u-boot ;
HAIKU_BOOT_TARGETS += u-boot ; HAIKU_BOOT_TARGETS += u-boot ;
Vendored
+1 -5
View File
@@ -33,7 +33,7 @@ options:
variables will be set accordingly. variables will be set accordingly.
<arch> specifies the target architecture, either <arch> specifies the target architecture, either
"x86_gcc2", "x86", "x86_64", "ppc", "m68k", "x86_gcc2", "x86", "x86_64", "ppc", "m68k",
"arm", "arm64", "riscv32", "riscv64", "sparc" "arm", "arm64", "riscv64", "sparc"
This option and --cross-tools-prefix can be This option and --cross-tools-prefix can be
specified multiple times. The first cross tools specified multiple times. The first cross tools
specify the primary tools, the subsequent ones the specify the primary tools, the subsequent ones the
@@ -271,7 +271,6 @@ standard_gcc_settings()
i?86-*) targetCpu=x86;; i?86-*) targetCpu=x86;;
m68k-*) targetCpu=m68k;; m68k-*) targetCpu=m68k;;
powerpc-*) targetCpu=ppc;; powerpc-*) targetCpu=ppc;;
riscv32-*) targetCpu=riscv32;;
riscv64-*) targetCpu=riscv64;; riscv64-*) targetCpu=riscv64;;
sparc64-*) targetCpu=sparc;; sparc64-*) targetCpu=sparc;;
x86_64-*) targetCpu=x86_64;; x86_64-*) targetCpu=x86_64;;
@@ -631,7 +630,6 @@ supportedTargetArchs="
arm64 arm64
m68k m68k
ppc ppc
riscv32
riscv64 riscv64
sparc sparc
x86 x86
@@ -682,7 +680,6 @@ while [ $# -gt 0 ] ; do
ppc) targetMachine=powerpc-apple-haiku;; ppc) targetMachine=powerpc-apple-haiku;;
m68k) targetMachine=m68k-unknown-haiku;; m68k) targetMachine=m68k-unknown-haiku;;
arm) targetMachine=arm-unknown-haiku;; arm) targetMachine=arm-unknown-haiku;;
riscv32) targetMachine=riscv32-unknown-haiku;;
riscv64) targetMachine=riscv64-unknown-haiku;; riscv64) targetMachine=riscv64-unknown-haiku;;
sparc) targetMachine=sparc64-unknown-haiku;; sparc) targetMachine=sparc64-unknown-haiku;;
*) *)
@@ -743,7 +740,6 @@ while [ $# -gt 0 ] ; do
ppc) targetMachine=powerpc-apple-haiku;; ppc) targetMachine=powerpc-apple-haiku;;
arm) targetMachine=arm-unknown-haiku;; arm) targetMachine=arm-unknown-haiku;;
arm64) targetMachine=arm64-unknown-haiku;; arm64) targetMachine=arm64-unknown-haiku;;
riscv32) targetMachine=riscv32-unknown-haiku;;
riscv64) targetMachine=riscv64-unknown-haiku;; riscv64) targetMachine=riscv64-unknown-haiku;;
sparc) targetMachine=sparc64-unknown-haiku;; sparc) targetMachine=sparc64-unknown-haiku;;
*) *)
-5
View File
@@ -61,11 +61,6 @@
# define __HAIKU_ARCH_ABI "arm64" # define __HAIKU_ARCH_ABI "arm64"
# define __HAIKU_ARCH_ARM64 1 # define __HAIKU_ARCH_ARM64 1
# define __HAIKU_ARCH_BITS 64 # define __HAIKU_ARCH_BITS 64
#elif defined(__riscv32__) || (defined(__riscv) && __riscv_xlen == 32)
# define __HAIKU_ARCH riscv32
# define __HAIKU_ARCH_ABI "riscv32"
# define __HAIKU_ARCH_RISCV32 1
# define __HAIKU_ARCH_BITS 32
#elif defined(__riscv64__) || (defined(__riscv) && __riscv_xlen == 64) #elif defined(__riscv64__) || (defined(__riscv) && __riscv_xlen == 64)
# define __HAIKU_ARCH riscv64 # define __HAIKU_ARCH riscv64
# define __HAIKU_ARCH_ABI "riscv64" # define __HAIKU_ARCH_ABI "riscv64"
@@ -1,10 +0,0 @@
SubDir HAIKU_TOP src add-ons kernel bus_managers config_manager arch $(TARGET_ARCH) ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) ] ;
UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_ARCH) ] ;
KernelStaticLibrary config_manager_arch :
config_manager_arch.c
;
@@ -1,18 +0,0 @@
/*
* Copyright 2009 Haiku, Inc.
* Distributed under the terms of the MIT License.
*
* arch-specific config manager
*
* Authors (in chronological order):
* François Revol ([email protected])
*/
#include <OS.h>
#include <config_manager.h>
int config_manager_scan_hardcoded(struct device_info **info, int32 *count)
{
return B_OK;
}
-2
View File
@@ -1,2 +0,0 @@
SubDir HAIKU_TOP src add-ons kernel cpu riscv32 ;
-21
View File
@@ -1,21 +0,0 @@
SubDir HAIKU_TOP src system glue arch riscv32 ;
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup riscv32 ] {
on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ;
UsePrivateSystemHeaders ;
local sources =
crti.S
crtn.S
;
MergeObject <$(architecture)>glue_arch_$(TARGET_ARCH).o : $(sources) ;
if $(HAIKU_BUILD_TYPE) = bootstrap {
# build a version for stage0 of the bootstrap process
BootstrapStage0PlatformObjects [ FGristFiles $(sources) ] : true ;
}
}
}
-28
View File
@@ -1,28 +0,0 @@
/*
* Copyright 2005, Axel Dörfler, axeld@pinc-software.de.
* Distributed under the terms of the MIT License.
*/
/** This file contains the first part of the ".init" and ".fini" sections in
* the ELF executable.
* The functions defined here will be called during initialization/termination
* of the loaded executable/library. The ".init" and ".fini" sections are
* stacked together like this:
*
* crti.S entry point
* call to _init_before/_term_before
* crtbegin.S GCC specific: constructors/destructors are called, ...
* crtend.S
* crtn.S call to _init_after/_term_after
* exit
*/
#define FUNCTION(x) .global x; .type x,%function; x
.section .init
FUNCTION(_init):
// crtbegin.o stuff comes here
.section .fini
FUNCTION(_fini):
// crtbegin.o stuff comes here
-17
View File
@@ -1,17 +0,0 @@
/*
* Copyright 2005, Axel Dörfler, axeld@pinc-software.de.
* Distributed under the terms of the MIT License.
*/
/** This file contains the final part of the ".init" and ".fini" sections in
* the ELF executable. It is tightly connected to crti.S.
* Have a look at crti.S to find a description of what happens here.
*/
.section .init
// the image ID and program args are still on the stack
.section .fini
// the image ID and program args are still on the stack
-4
View File
@@ -1,4 +0,0 @@
SubDir HAIKU_TOP src system kernel arch riscv32 ;
SubDirHdrs $(SUBDIR) $(DOTDOT) generic ;
UsePrivateKernelHeaders ;
@@ -1,34 +0,0 @@
SubDir HAIKU_TOP src system kernel lib arch riscv32 ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) generic ] ;
local librootSources = [ FDirName $(HAIKU_TOP) src system libroot ] ;
local posixSources = [ FDirName $(librootSources) posix ] ;
SEARCH_SOURCE += [ FDirName $(librootSources) os arch $(TARGET_ARCH) ] ;
SEARCH_SOURCE += [ FDirName $(librootSources) os arch generic ] ;
KernelMergeObject kernel_os_arch_$(TARGET_ARCH).o :
byteorder.S
generic_atomic.cpp
generic_system_time_nsecs.cpp
: $(TARGET_KERNEL_PIC_CCFLAGS)
;
SEARCH_SOURCE += [ FDirName $(posixSources) arch $(TARGET_ARCH) ] ;
SEARCH_SOURCE += [ FDirName $(posixSources) string arch generic ] ;
SEARCH_SOURCE += [ FDirName $(posixSources) string arch $(TARGET_ARCH) ] ;
KernelMergeObject kernel_lib_posix_arch_$(TARGET_ARCH).o :
siglongjmp.S
sigsetjmp.S
kernel_longjmp_return.c
kernel_setjmp_save_sigs.c
arch_string.S
memset.c
: $(TARGET_KERNEL_PIC_CCFLAGS)
;
@@ -1,17 +0,0 @@
SubDir HAIKU_TOP src system libroot posix string arch riscv32 ;
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup riscv32 ] {
on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ;
UsePrivateSystemHeaders ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) generic ] ;
MergeObject <$(architecture)>posix_string_arch_$(TARGET_ARCH).o :
memcpy.c
memset.c
;
}
}
@@ -1,22 +0,0 @@
SubDir HAIKU_TOP src system runtime_loader arch riscv32 ;
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup riscv32 ] {
on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ;
UsePrivateHeaders runtime_loader ;
UsePrivateSystemHeaders ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) ] ;
StaticLibrary <$(architecture)>libruntime_loader_$(TARGET_ARCH).a :
arch_relocate.cpp
:
<src!system!libroot!os!arch!$(TARGET_ARCH)!$(architecture)>thread.o
<src!system!libroot!posix!string!arch!$(TARGET_ARCH)!$(architecture)>arch_string.o
<src!system!libroot!posix!string!arch!$(TARGET_ARCH)!$(architecture)>memset.o
;
}
}
@@ -1,30 +0,0 @@
/*
* Copyright 2012-2018, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
* Ithamar R. Adema <ithamar@upgrade-android.com>
*/
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include "runtime_loader_private.h"
#include <runtime_loader.h>
//#define TRACE_RLD
#ifdef TRACE_RLD
# define TRACE(x) dprintf x
#else
# define TRACE(x) ;
#endif
status_t
arch_relocate_image(image_t *rootImage, image_t *image,
SymbolLookupCache* cache)
{
debugger("arch_relocate_image: Not Yet Implemented!");
return B_OK;
}