Skip to content

Commit

Permalink
Fix gdbarm32/conf.COG on macos [ci skip]
Browse files Browse the repository at this point in the history
  • Loading branch information
@eliotmiranda
eliotmiranda committed Aug 27, 2021
1 parent 2dba044 commit 169ec8b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion building/macos64ARMv8/gdbarm32/conf.COG
View file
Expand Up @@ -2,7 +2,7 @@
S=../../../../processors/ARM/gdb-8.3.1
TARGET="--target=aarch64 -mcpu=apple-a12"
export CFLAGS="$TARGET -g -Os -m64 -DCOG=1 -DWORDS_BIGENDIAN=0"
export CFLAGS="$TARGET -g3 -O0 -m64 -DCOG=1 -DWORDS_BIGENDIAN=0"
export CFLAGS="$TARGET -g3 -O0 -m64 -DCOG=1 -DWORDS_BIGENDIAN=0 -I../../../../../platforms/Cross/plugins/GdbARMPlugin"
CONFFLAGS='--target=arm-apple-darwin CC=clang CXX=clang++ --with-system-zlib=yes'
mkdir -p bfd libiberty opcodes sim/common sim/arm
for d in bfd libiberty opcodes; do
Expand Down
2 changes: 1 addition & 1 deletion building/macos64x64/gdbarm32/conf.COG
View file
@@ -1,7 +1,7 @@
#!/bin/sh
S=../../../../processors/ARM/gdb-8.3.1
export CFLAGS="-g -Os -m64 -DCOG=1 -DWORDS_BIGENDIAN=0"
export CFLAGS="-g3 -O0 -m64 -DCOG=1 -DWORDS_BIGENDIAN=0"
export CFLAGS="-g3 -O0 -m64 -DCOG=1 -DWORDS_BIGENDIAN=0 -I../../../../../platforms/Cross/plugins/GdbARMPlugin"
CONFFLAGS='--target=arm-apple-darwin CC=clang CXX=clang++ --with-system-zlib=yes'
mkdir -p bfd libiberty opcodes sim/common sim/arm
for d in bfd libiberty opcodes; do
Expand Down

2 comments on commit 169ec8b

@marceltaeumel
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still wonder about the execution path of "conf.COG". Well, I changed "S=" because it is now one level deeper because of "building" but "../../../../processors" still doesn't make sense because "building/macos64ARMv8/gdbarm32/" is only 3 levels away from the top folder, not four. Same for the addition of "-I" in this commit, which assumes even 5 levels deep.

For "macos64x64/bochsx64/conf.COG" is looks reasonable: "../../../processors/IA32/bochs/configure", which is 3 hops back to the top level.

Can you explain this?

@eliotmiranda
Copy link
Contributor Author

@eliotmiranda eliotmiranda commented on 169ec8b Aug 27, 2021 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.