hrev53030 adds 1 changeset to branch 'master'
old head: 7a180033de39d359d8c85c157b7dce856a2aacf1
new head: c59cde3d69039ab7935cfe78e9adb0cf184ca8a1
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=c59cde3d6903+%5E7a180033de39
----------------------------------------------------------------------------
c59cde3d6903: 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 <pulkomandy@xxxxxxxxx>
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev53030
Commit: c59cde3d69039ab7935cfe78e9adb0cf184ca8a1
URL: https://git.haiku-os.org/haiku/commit/?id=c59cde3d6903
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Thu Apr 4 03:50:47 2019 UTC
Committer: Alex von Gluck IV <kallisti5@xxxxxxxxxxx>
Commit-Date: Thu Apr 4 13:23:32 2019 UTC
----------------------------------------------------------------------------
15 files changed, 2 insertions(+), 229 deletions(-)
3rdparty/kallisti5/configure.py | 4 +--
build/jam/ArchitectureRules | 13 --------
configure | 6 +---
headers/config/HaikuConfig.h | 5 ---
.../config_manager/arch/riscv32/Jamfile | 10 ------
.../arch/riscv32/config_manager_arch.c | 18 -----------
src/add-ons/kernel/cpu/riscv32/Jamfile | 2 --
src/system/glue/arch/riscv32/Jamfile | 21 ------------
src/system/glue/arch/riscv32/crti.S | 28 ----------------
src/system/glue/arch/riscv32/crtn.S | 17 ----------
src/system/kernel/arch/riscv32/Jamfile | 4 ---
src/system/kernel/lib/arch/riscv32/Jamfile | 34 --------------------
.../libroot/posix/string/arch/riscv32/Jamfile | 17 ----------
src/system/runtime_loader/arch/riscv32/Jamfile | 22 -------------
.../arch/riscv32/arch_relocate.cpp | 30 -----------------
----------------------------------------------------------------------------
diff --git a/3rdparty/kallisti5/configure.py b/3rdparty/kallisti5/configure.py
index b195cb5ed7..187b862a6e 100755
--- a/3rdparty/kallisti5/configure.py
+++ b/3rdparty/kallisti5/configure.py
@@ -14,7 +14,7 @@ from pprint import pprint
parser = argparse.ArgumentParser(description='Configure a build of Haiku')
parser.add_argument('--target-arch', nargs=1,
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,
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>'))
@@ -129,8 +129,6 @@ def triplet_lookup(arch):
return "m68k-unknown-haiku"
elif arch == "arm":
return "arm-unknown-haiku"
- elif arch == "riscv32":
- return "riscv32-unknown-haiku"
elif arch == "riscv64":
return "riscv64-unknown-haiku"
else:
diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 2ef5594a50..f727128e13 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -302,19 +302,6 @@ rule KernelArchitectureSetup architecture
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 :
HAIKU_BOOT_PLATFORM ?= u-boot ;
HAIKU_BOOT_TARGETS += u-boot ;
diff --git a/configure b/configure
index 13ac710317..50f044891c 100755
--- a/configure
+++ b/configure
@@ -33,7 +33,7 @@ options:
variables will be set accordingly.
<arch> specifies the target architecture, either
"x86_gcc2", "x86", "x86_64", "ppc", "m68k",
- "arm", "arm64", "riscv32", "riscv64", "sparc"
+ "arm", "arm64", "riscv64", "sparc"
This option and --cross-tools-prefix can be
specified multiple times. The first cross tools
specify the primary tools, the subsequent ones
the
@@ -271,7 +271,6 @@ standard_gcc_settings()
i?86-*) targetCpu=x86;;
m68k-*) targetCpu=m68k;;
powerpc-*) targetCpu=ppc;;
- riscv32-*) targetCpu=riscv32;;
riscv64-*) targetCpu=riscv64;;
sparc64-*) targetCpu=sparc;;
x86_64-*) targetCpu=x86_64;;
@@ -631,7 +630,6 @@ supportedTargetArchs="
arm64
m68k
ppc
- riscv32
riscv64
sparc
x86
@@ -682,7 +680,6 @@ while [ $# -gt 0 ] ; do
ppc)
targetMachine=powerpc-apple-haiku;;
m68k)
targetMachine=m68k-unknown-haiku;;
arm)
targetMachine=arm-unknown-haiku;;
- riscv32)
targetMachine=riscv32-unknown-haiku;;
riscv64)
targetMachine=riscv64-unknown-haiku;;
sparc)
targetMachine=sparc64-unknown-haiku;;
*)
@@ -743,7 +740,6 @@ while [ $# -gt 0 ] ; do
ppc)
targetMachine=powerpc-apple-haiku;;
arm)
targetMachine=arm-unknown-haiku;;
arm64)
targetMachine=arm64-unknown-haiku;;
- riscv32)
targetMachine=riscv32-unknown-haiku;;
riscv64)
targetMachine=riscv64-unknown-haiku;;
sparc)
targetMachine=sparc64-unknown-haiku;;
*)
diff --git a/headers/config/HaikuConfig.h b/headers/config/HaikuConfig.h
index 07f591caaa..a120f216f7 100644
--- a/headers/config/HaikuConfig.h
+++ b/headers/config/HaikuConfig.h
@@ -61,11 +61,6 @@
# define __HAIKU_ARCH_ABI "arm64"
# define __HAIKU_ARCH_ARM64 1
# 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)
# define __HAIKU_ARCH riscv64
# define __HAIKU_ARCH_ABI "riscv64"
diff --git
a/src/add-ons/kernel/bus_managers/config_manager/arch/riscv32/Jamfile
b/src/add-ons/kernel/bus_managers/config_manager/arch/riscv32/Jamfile
deleted file mode 100644
index 909a67c5ee..0000000000
--- a/src/add-ons/kernel/bus_managers/config_manager/arch/riscv32/Jamfile
+++ /dev/null
@@ -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
- ;
-
diff --git
a/src/add-ons/kernel/bus_managers/config_manager/arch/riscv32/config_manager_arch.c
b/src/add-ons/kernel/bus_managers/config_manager/arch/riscv32/config_manager_arch.c
deleted file mode 100644
index 1996ba4daf..0000000000
---
a/src/add-ons/kernel/bus_managers/config_manager/arch/riscv32/config_manager_arch.c
+++ /dev/null
@@ -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 (revol@xxxxxxx)
- */
-
-#include <OS.h>
-#include <config_manager.h>
-
-int config_manager_scan_hardcoded(struct device_info **info, int32 *count)
-{
- return B_OK;
-}
-
diff --git a/src/add-ons/kernel/cpu/riscv32/Jamfile
b/src/add-ons/kernel/cpu/riscv32/Jamfile
deleted file mode 100644
index 380e405c57..0000000000
--- a/src/add-ons/kernel/cpu/riscv32/Jamfile
+++ /dev/null
@@ -1,2 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel cpu riscv32 ;
-
diff --git a/src/system/glue/arch/riscv32/Jamfile
b/src/system/glue/arch/riscv32/Jamfile
deleted file mode 100644
index 5ec9d7ae5d..0000000000
--- a/src/system/glue/arch/riscv32/Jamfile
+++ /dev/null
@@ -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 ;
- }
- }
-}
diff --git a/src/system/glue/arch/riscv32/crti.S
b/src/system/glue/arch/riscv32/crti.S
deleted file mode 100644
index 680b4f24a5..0000000000
--- a/src/system/glue/arch/riscv32/crti.S
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2005, Axel Dörfler, axeld@xxxxxxxxxxxxxxxx.
- * 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
diff --git a/src/system/glue/arch/riscv32/crtn.S
b/src/system/glue/arch/riscv32/crtn.S
deleted file mode 100644
index 48e3dc6170..0000000000
--- a/src/system/glue/arch/riscv32/crtn.S
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2005, Axel Dörfler, axeld@xxxxxxxxxxxxxxxx.
- * 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
-
diff --git a/src/system/kernel/arch/riscv32/Jamfile
b/src/system/kernel/arch/riscv32/Jamfile
deleted file mode 100644
index 4da73e15a0..0000000000
--- a/src/system/kernel/arch/riscv32/Jamfile
+++ /dev/null
@@ -1,4 +0,0 @@
-SubDir HAIKU_TOP src system kernel arch riscv32 ;
-
-SubDirHdrs $(SUBDIR) $(DOTDOT) generic ;
-UsePrivateKernelHeaders ;
diff --git a/src/system/kernel/lib/arch/riscv32/Jamfile
b/src/system/kernel/lib/arch/riscv32/Jamfile
deleted file mode 100644
index f061d894ec..0000000000
--- a/src/system/kernel/lib/arch/riscv32/Jamfile
+++ /dev/null
@@ -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)
-;
diff --git a/src/system/libroot/posix/string/arch/riscv32/Jamfile
b/src/system/libroot/posix/string/arch/riscv32/Jamfile
deleted file mode 100644
index 76bbd8584e..0000000000
--- a/src/system/libroot/posix/string/arch/riscv32/Jamfile
+++ /dev/null
@@ -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
- ;
- }
-}
diff --git a/src/system/runtime_loader/arch/riscv32/Jamfile
b/src/system/runtime_loader/arch/riscv32/Jamfile
deleted file mode 100644
index 609feed239..0000000000
--- a/src/system/runtime_loader/arch/riscv32/Jamfile
+++ /dev/null
@@ -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
- ;
- }
-}
diff --git a/src/system/runtime_loader/arch/riscv32/arch_relocate.cpp
b/src/system/runtime_loader/arch/riscv32/arch_relocate.cpp
deleted file mode 100644
index 3a57919364..0000000000
--- a/src/system/runtime_loader/arch/riscv32/arch_relocate.cpp
+++ /dev/null
@@ -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@xxxxxxxxxxxxxxxxxxx>
- */
-
-#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;
-}
