Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
DiSL
DiSL
Commits
75d62a98
Commit
75d62a98
authored
Sep 02, 2020
by
Lubomir Bulej
Browse files
Merge branch 'feature/linux_ppc64' into 'master'
Support linux ppc64 See merge request
!14
parents
67d3b846
01fe54c5
Pipeline
#9268
passed with stages
in 2 minutes and 24 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
build.xml
View file @
75d62a98
...
...
@@ -314,6 +314,7 @@
<ac:switch
value=
"${os.arch}"
caseinsensitive=
"true"
>
<case
value=
"x86_64"
><property
name=
"disl.agent.arch"
value=
"x86_64"
/></case>
<case
value=
"amd64"
><property
name=
"disl.agent.arch"
value=
"x86_64"
/></case>
<case
value=
"ppc64"
><property
name=
"disl.agent.arch"
value=
"ppc64"
/></case>
<default><property
name=
"disl.agent.arch"
value=
"x86"
/></default>
</ac:switch>
...
...
src-disl-agent/Makefile
View file @
75d62a98
...
...
@@ -78,7 +78,7 @@ else ifeq (Linux,$(TARGET_ENV))
#
CFLAGS_WHOLE
:=
-flto
-fwhole-program
if
n
eq
(
x86_64,$(TARGET_CPU
))
ifeq
(
,$(filter $(TARGET_CPU),x86_64 ppc64
))
CFLAGS
+=
-m32
LDFLAGS
+=
-melf_i386
endif
...
...
@@ -89,6 +89,8 @@ endif
ifeq
(x86_64,$(TARGET_CPU))
BUILD_DIR
:=
$(JDK_TARGET)
-x86_64
else
ifeq
(ppc64,$(TARGET_CPU))
BUILD_DIR
:=
$(JDK_TARGET)
-ppc64
else
BUILD_DIR
:=
$(JDK_TARGET)
-x86
endif
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment