summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlaksen <laksen@3ad0048d-3df7-0310-abae-a5850022a9f2>2018-09-01 19:46:04 +0000
committerlaksen <laksen@3ad0048d-3df7-0310-abae-a5850022a9f2>2018-09-01 19:46:04 +0000
commit1f598039cbaaf19442a78c0c09eba966bff5f3ee (patch)
tree3d5b570a71962eed83d49b88762e60d5ad7763f6
parent0c775d82d379ccd6eeb33d926c2da5abc96ec4d7 (diff)
downloadfpc-1f598039cbaaf19442a78c0c09eba966bff5f3ee.tar.gz
argc is a longint.
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/laksen@39696 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r--riscv_new/rtl/linux/riscv64/cprt0.as4
-rw-r--r--riscv_new/rtl/linux/riscv64/dllprt0.as14
-rw-r--r--riscv_new/rtl/linux/riscv64/prt0.as4
3 files changed, 11 insertions, 11 deletions
diff --git a/riscv_new/rtl/linux/riscv64/cprt0.as b/riscv_new/rtl/linux/riscv64/cprt0.as
index 01f4835dae..17f520f896 100644
--- a/riscv_new/rtl/linux/riscv64/cprt0.as
+++ b/riscv_new/rtl/linux/riscv64/cprt0.as
@@ -65,7 +65,7 @@ _start:
add a4, a2, a4
1:auipc x8,%pcrel_hi(operatingsystem_parameter_argc)
- sd a1,%pcrel_lo(1b)(x8)
+ sw a1,%pcrel_lo(1b)(x8)
1:auipc x8,%pcrel_hi(operatingsystem_parameter_argv)
sd a2,%pcrel_lo(1b)(x8)
1:auipc x8,%pcrel_hi(operatingsystem_parameter_envp)
@@ -118,7 +118,7 @@ __data_start:
.comm __stkptr,8
.comm operatingsystem_parameter_envp,8
- .comm operatingsystem_parameter_argc,8
+ .comm operatingsystem_parameter_argc,4
.comm operatingsystem_parameter_argv,8
.section ".comment"
diff --git a/riscv_new/rtl/linux/riscv64/dllprt0.as b/riscv_new/rtl/linux/riscv64/dllprt0.as
index 3e53d59947..9c0cc1cccd 100644
--- a/riscv_new/rtl/linux/riscv64/dllprt0.as
+++ b/riscv_new/rtl/linux/riscv64/dllprt0.as
@@ -28,7 +28,7 @@ FPC_SHARED_LIB_START:
/* a0 contains argc, a1 contains argv and a2 contains envp */
1:auipc x8,%pcrel_hi(operatingsystem_parameter_argc)
- sd a0,%pcrel_lo(1b)(x8)
+ sw a0,%pcrel_lo(1b)(x8)
1:auipc x8,%pcrel_hi(operatingsystem_parameter_argv)
sd a1,%pcrel_lo(1b)(x8)
1:auipc x8,%pcrel_hi(operatingsystem_parameter_envp)
@@ -60,15 +60,15 @@ _haltproc:
.data
.type operatingsystem_parameters,object
- .size operatingsystem_parameters,24
+ .size operatingsystem_parameters, 24
operatingsystem_parameters:
- .skip 3*8
- .global operatingsystem_parameter_envp
+ .skip 3 * 8
.global operatingsystem_parameter_argc
.global operatingsystem_parameter_argv
- .set operatingsystem_parameter_envp,operatingsystem_parameters+0
- .set operatingsystem_parameter_argc,operatingsystem_parameters+8
- .set operatingsystem_parameter_argv,operatingsystem_parameters+16
+ .global operatingsystem_parameter_envp
+ .set operatingsystem_parameter_argc, operatingsystem_parameters+0
+ .set operatingsystem_parameter_argv, operatingsystem_parameters+8
+ .set operatingsystem_parameter_envp, operatingsystem_parameters+16
.bss
diff --git a/riscv_new/rtl/linux/riscv64/prt0.as b/riscv_new/rtl/linux/riscv64/prt0.as
index deaca13a29..e58feb3469 100644
--- a/riscv_new/rtl/linux/riscv64/prt0.as
+++ b/riscv_new/rtl/linux/riscv64/prt0.as
@@ -34,7 +34,7 @@ _start:
/* Save argc, argv, envp, and initial stack pointer */
1:auipc x8,%pcrel_hi(operatingsystem_parameter_argc)
- sd x5,%pcrel_lo(1b)(x8)
+ sw x5,%pcrel_lo(1b)(x8)
1:auipc x8,%pcrel_hi(operatingsystem_parameter_argv)
sd x6,%pcrel_lo(1b)(x8)
1:auipc x8,%pcrel_hi(operatingsystem_parameter_envp)
@@ -79,7 +79,7 @@ __data_start:
.comm __stkptr,8
.comm operatingsystem_parameter_envp,8
- .comm operatingsystem_parameter_argc,8
+ .comm operatingsystem_parameter_argc,4
.comm operatingsystem_parameter_argv,8
.section .note.GNU-stack,"",%progbits